Merge pull request #134 from bf2fc6cc711aee1a0c2a/loosen-api

CR Updates fix
redhat-developer · Mar 16, 2021 · 6cca5cd · 6cca5cd
2 parents e7f1bc8 + e384e36
commit 6cca5cd
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 7 deletions.
diff --git a/build_docs/debugging.adoc b/build_docs/debugging.adoc
@@ -0,0 +1,13 @@
+== Debugging Operator
+
+=== Setting up log level
+
+RHOAS_LOG_LEVEL=INFO
+
+=== Changing API path to local mock
+
+CLOUD_SERVICES_API=localhost:8080
+
+=== Listen to only single namespace
+
+QUARKUS_OPERATOR_SDK_CONTROLLERS_KAFKACONNECTIONCONTROLLER_NAMESPACES=operator_sandbox
diff --git a/olm/olm-template/manifests/rhoas-operator.cloudserviceaccountrequest.crd.yaml b/olm/olm-template/manifests/rhoas-operator.cloudserviceaccountrequest.crd.yaml
@@ -60,4 +60,3 @@ spec:
                       type: string
             type: object
         type: object
-  preserveUnknownFields: false
diff --git a/olm/olm-template/manifests/rhoas-operator.cloudservicesrequests.crd.yaml b/olm/olm-template/manifests/rhoas-operator.cloudservicesrequests.crd.yaml
@@ -25,6 +25,8 @@ spec:
                 accessTokenSecretName:
                   type: string
               type: object
+              ## temporary required to workaround lack of scheduling issue with the operator SDK
+              x-kubernetes-preserve-unknown-fields: true
             status:
               properties:
                 message:
@@ -80,4 +82,3 @@ spec:
                         type: string
               type: object
           type: object
-  preserveUnknownFields: false
diff --git a/olm/olm-template/manifests/rhoas-operator.kafkaconnections.crd.yaml b/olm/olm-template/manifests/rhoas-operator.kafkaconnections.crd.yaml
@@ -43,6 +43,8 @@ spec:
                     type: string
                 type: object
             type: object
+            ## temporary required to workaround lack of scheduling issue with the operator SDK
+            preserveUnknownFields: true
           status:
             properties:
               message:
@@ -78,4 +80,3 @@ spec:
                       type: string
             type: object
         type: object
-  preserveUnknownFields: false
diff --git a/source/rhoas/src/main/java/com/openshift/cloud/beans/KafkaApiClient.java b/source/rhoas/src/main/java/com/openshift/cloud/beans/KafkaApiClient.java
@@ -29,7 +29,7 @@ public class KafkaApiClient {
 
   @Inject KubernetesClient k8sClient;
 
-  @ConfigProperty(name = "client.basePath", defaultValue = "https://api.stage.openshift.com")
+  @ConfigProperty(name = "rhoas.client.apiBasePath")
   String clientBasePath;
 
   private DefaultApi createClient(String bearerToken) {

diff --git a/source/rhoas/src/main/resources/application.properties b/source/rhoas/src/main/resources/application.properties
@@ -14,6 +14,7 @@ quarkus.container-image.registry=quay.io
 ## it is a workaround for a resources issue
 quarkus.jib.jvm-arguments=-Xmx64m,-Xms32m
 
-## Local dev options
-### Configure to watch only single namespace
-# quarkus.operator-sdk.controllers.annotation.namespaces=rhoas-sandbox
+
+quarkus.log.level=${RHOAS_LOG_LEVEL:INFO}
+
+rhoas.client.apiBasePath=${CLOUD_SERVICES_API:https://api.stage.openshift.com}