From b5e891ba43484727403ee164578ef9614e18f389 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 23 Jun 2023 10:56:50 +0200
Subject: [PATCH] OZG-3961 - tests
---
pom.xml | 2 +-
src/main/java/de/ozgcloud/operator/Config.java | 10 ++++------
.../operator/keycloak/user/KeycloakUserFinalizer.java | 11 +++++------
.../keycloak/user/KeycloakUserReconciler.java | 3 ++-
4 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/pom.xml b/pom.xml
index a4f00ba..6b94b86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<name>OZG Cloud Operator</name>
<description>OZG Cloud Operator</description>
<properties>
- <operator-sdk.version>4.2.8</operator-sdk.version>
+ <operator-sdk.version>5.1.0</operator-sdk.version>
<spring-boot.build-image.imageName>docker.ozg-sh.de/ozg-operator:build-latest</spring-boot.build-image.imageName>
<mapstruct.version>1.5.5.Final</mapstruct.version>
diff --git a/src/main/java/de/ozgcloud/operator/Config.java b/src/main/java/de/ozgcloud/operator/Config.java
index 69ccd13..0250823 100644
--- a/src/main/java/de/ozgcloud/operator/Config.java
+++ b/src/main/java/de/ozgcloud/operator/Config.java
@@ -5,8 +5,6 @@ import java.util.List;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import io.fabric8.kubernetes.client.KubernetesClient;
-import io.fabric8.kubernetes.client.KubernetesClientBuilder;
import io.javaoperatorsdk.operator.Operator;
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
@@ -32,8 +30,8 @@ public class Config {
// return new KubernetesClientBuilder().withConfig(config).build();
// }
- @Bean
- KubernetesClient kubernetesClient() {
- return new KubernetesClientBuilder().build();
- }
+// @Bean
+// KubernetesClient kubernetesClient() {
+// return new KubernetesClientBuilder().build();
+// }
}
\ No newline at end of file
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserFinalizer.java b/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserFinalizer.java
index 6e9f857..f57fb1d 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserFinalizer.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserFinalizer.java
@@ -1,20 +1,19 @@
package de.ozgcloud.operator.keycloak.user;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*;
+
import java.util.logging.Level;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
import io.javaoperatorsdk.operator.api.reconciler.Cleaner;
import io.javaoperatorsdk.operator.api.reconciler.Context;
-import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
import io.javaoperatorsdk.operator.api.reconciler.DeleteControl;
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
-import lombok.extern.java.Log;
-@ControllerConfiguration
-@Component
-@Log
+//@ControllerConfiguration
+//@Component
+//@Log
public class KeycloakUserFinalizer implements Cleaner<KeycloakUser> {
public static final String STATUS_OK = "OK";
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconciler.java b/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconciler.java
index f2980bb..c6f27cf 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconciler.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconciler.java
@@ -3,6 +3,7 @@ package de.ozgcloud.operator.keycloak.user;
import java.util.logging.Level;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
import io.javaoperatorsdk.operator.api.reconciler.Context;
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
@@ -11,7 +12,7 @@ import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
import lombok.extern.java.Log;
@ControllerConfiguration
-//@Component
+@Component
@Log
public class KeycloakUserReconciler implements Reconciler<KeycloakUser> {
--
GitLab