Skip to content
Snippets Groups Projects
Commit 513b887f authored by Sören Henning's avatar Sören Henning
Browse files

Add missing conflict resolves

parent d8977b26
No related branches found
No related tags found
1 merge request!213Upgrade Quarkus
...@@ -106,7 +106,7 @@ class TheodoliteOperator { ...@@ -106,7 +106,7 @@ class TheodoliteOperator {
return executionStateHandler return executionStateHandler
} }
private fun getBenchmarkStateHandler(client: NamespacedKubernetesClient) : BenchmarkStateHandler { fun getBenchmarkStateHandler(client: NamespacedKubernetesClient) : BenchmarkStateHandler {
if (!::benchmarkStateHandler.isInitialized) { if (!::benchmarkStateHandler.isInitialized) {
this.benchmarkStateHandler = BenchmarkStateHandler(client = client) this.benchmarkStateHandler = BenchmarkStateHandler(client = client)
} }
...@@ -150,7 +150,7 @@ class TheodoliteOperator { ...@@ -150,7 +150,7 @@ class TheodoliteOperator {
) )
} }
private fun getBenchmarkClient(client: NamespacedKubernetesClient): MixedOperation< fun getBenchmarkClient(client: NamespacedKubernetesClient): MixedOperation<
BenchmarkCRD, BenchmarkCRD,
KubernetesBenchmarkList, KubernetesBenchmarkList,
Resource<BenchmarkCRD>> { Resource<BenchmarkCRD>> {
......
...@@ -44,18 +44,6 @@ class ExecutionEventHandlerTest { ...@@ -44,18 +44,6 @@ class ExecutionEventHandlerTest {
@BeforeEach @BeforeEach
fun setUp() { fun setUp() {
server.before() server.before()
val operator = TheodoliteOperator()
this.controller = operator.getController(
client = server.client,
executionStateHandler = operator.getExecutionStateHandler(client = server.client),
benchmarkStateChecker = operator.getBenchmarkStateChecker(client = server.client)
)
this.factory = operator.getExecutionEventHandler(this.controller, server.client)
this.stateHandler = TheodoliteOperator().getExecutionStateHandler(client = server.client)
this.executionVersion1 = K8sResourceLoaderFromFile(server.client)
.loadK8sResource("Execution", testResourcePath + "test-execution.yaml")
this.server.client this.server.client
.apiextensions().v1() .apiextensions().v1()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment