[KIECLOUD-134] (7.3.0) Enhance KieServerStateOpenShiftRepository - Fixing naming issue

businesscentral-monitoring/image.yaml

@@ -49,15 +49,15 @@ envs:
       example: "dasd373egds"
       description: "KIE server controller token for bearer authentication (Sets the org.kie.server.controller.token system property)"
 ## OpenShift Enhancement BEGIN
-    - name: KIE_CONTROLLER_OCP_ENABLED
-      example: "true"
-      description: "If set to true, turns on OpenShift integration feature (Sets the org.kie.workbench.controller.openshift.enabled system property)"
-    - name: KIE_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE
+    - name: KIE_SERVER_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE
       example: "false"
       description: "If set to true, enables connection to KIE Server via OpenShift internal Service endpoint (Sets the org.kie.server.controller.openshift.prefer.kieserver.service system property)"
-    - name: KIE_CONTROLLER_TEMPLATE_CACHE_TTL
+    - name: KIE_SERVER_CONTROLLER_TEMPLATE_CACHE_TTL
       example: "60000"
       description: "KIE ServerTemplate Cache TTL in milliseconds (Sets the org.kie.server.controller.template.cache.ttl system property)"
+    - name: KIE_WORKBENCH_CONTROLLER_OPENSHIFT_ENABLED
+      example: "true"
+      description: "If set to true, turns on OpenShift integration feature (Sets the org.kie.workbench.controller.openshift.enabled system property)"
 ## OpenShift Enhancement END
     - name: "KIE_SERVER_USER"
       example: "executionUser"

businesscentral/image.yaml

@@ -97,15 +97,15 @@ envs:
       example: "dasd373egds"
       description: "KIE server controller token for bearer authentication (Sets the org.kie.server.controller.token system property)"
 ## OpenShift Enhancement BEGIN
-    - name: KIE_CONTROLLER_OCP_ENABLED
-      example: "true"
-      description: "If set to true, turns on OpenShift integration feature (Sets the org.kie.workbench.controller.openshift.enabled system property)"
-    - name: KIE_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE
+    - name: KIE_SERVER_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE
       example: "false"
       description: "If set to true, enables connection to KIE Server via OpenShift internal Service endpoint (Sets the org.kie.server.controller.openshift.prefer.kieserver.service system property)"
-    - name: KIE_CONTROLLER_TEMPLATE_CACHE_TTL
+    - name: KIE_SERVER_CONTROLLER_TEMPLATE_CACHE_TTL
       example: "60000"
       description: "KIE ServerTemplate Cache TTL in milliseconds (Sets the org.kie.server.controller.template.cache.ttl system property)"
+    - name: KIE_WORKBENCH_CONTROLLER_OPENSHIFT_ENABLED
+      example: "true"
+      description: "If set to true, turns on OpenShift integration feature (Sets the org.kie.workbench.controller.openshift.enabled system property)"
 ## OpenShift Enhancement END
     - name: "WORKBENCH_MAX_METASPACE_SIZE"
       example: "512"

templates/rhpam73-authoring-ha.yaml

@@ -317,21 +317,21 @@ parameters:
   value: 1Gi
   required: true
 ## OpenShift Enhancement BEGIN
-- displayName: Enable OpenShift Integration
-  description: If set to true, turns on OpenShift integration feature (Sets the org.kie.workbench.controller.openshift.enabled system property)
-  name: KIE_CONTROLLER_OCP_ENABLED
-  value: "false"
-  required: false
-- displayName: Prefer KIE Server OpenShift Service
+- displayName: Prefer KIE Server OpenShift Service [Tech Preview]
   description: Enables connection to KIE Server via OpenShift internal Service endpoint (Sets the org.kie.server.controller.openshift.prefer.kieserver.service system property)
-  name: KIE_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE
+  name: KIE_SERVER_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE
   value: "false"
   required: false
-- displayName: KIE ServerTemplate Cache TTL
+- displayName: KIE ServerTemplate Cache TTL [Tech Preview]
   description: KIE ServerTemplate Cache TTL in milliseconds (Sets the org.kie.server.controller.template.cache.ttl system property)
-  name: KIE_CONTROLLER_TEMPLATE_CACHE_TTL
+  name: KIE_SERVER_CONTROLLER_TEMPLATE_CACHE_TTL
   value: "60000"
   required: false
+- displayName: Enable OpenShift Integration [Tech Preview]
+  description: If set to true, turns on OpenShift integration feature (Sets the org.kie.workbench.controller.openshift.enabled system property)
+  name: KIE_WORKBENCH_CONTROLLER_OPENSHIFT_ENABLED
+  value: "false"
+  required: false
 ## OpenShift Enhancement END
 - displayName: ImageStream Namespace
   description: Namespace in which the ImageStreams for Red Hat Middleware images are
@@ -965,12 +965,12 @@ objects:
           - name: KIE_MBEANS
             value: "${KIE_MBEANS}"
 ## OpenShift Enhancement BEGIN
-          - name: KIE_CONTROLLER_OCP_ENABLED
-            value: "${KIE_CONTROLLER_OCP_ENABLED}"
-          - name: KIE_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE
-            value: "${KIE_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE}"
-          - name: KIE_CONTROLLER_TEMPLATE_CACHE_TTL
-            value: "${KIE_CONTROLLER_TEMPLATE_CACHE_TTL}"
+          - name: KIE_SERVER_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE
+            value: "${KIE_SERVER_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE}"
+          - name: KIE_SERVER_CONTROLLER_TEMPLATE_CACHE_TTL
+            value: "${KIE_SERVER_CONTROLLER_TEMPLATE_CACHE_TTL}"
+          - name: KIE_WORKBENCH_CONTROLLER_OPENSHIFT_ENABLED
+            value: "${KIE_WORKBENCH_CONTROLLER_OPENSHIFT_ENABLED}"
 ## OpenShift Enhancement END
           - name: KIE_SERVER_CONTROLLER_USER
             value: "${KIE_SERVER_CONTROLLER_USER}"

templates/rhpam73-authoring.yaml

@@ -187,21 +187,21 @@ parameters:
   value: 1Gi
   required: true
 ## OpenShift Enhancement BEGIN
-- displayName: Enable OpenShift Integration
-  description: If set to true, turns on OpenShift integration feature (Sets the org.kie.workbench.controller.openshift.enabled system property)
-  name: KIE_CONTROLLER_OCP_ENABLED
-  value: "false"
-  required: false
-- displayName: Prefer KIE Server OpenShift Service
+- displayName: Prefer KIE Server OpenShift Service [Tech Preview]
   description: Enables connection to KIE Server via OpenShift internal Service endpoint (Sets the org.kie.server.controller.openshift.prefer.kieserver.service system property)
-  name: KIE_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE
+  name: KIE_SERVER_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE
   value: "false"
   required: false
-- displayName: KIE ServerTemplate Cache TTL
+- displayName: KIE ServerTemplate Cache TTL [Tech Preview]
   description: KIE ServerTemplate Cache TTL in milliseconds (Sets the org.kie.server.controller.template.cache.ttl system property)
-  name: KIE_CONTROLLER_TEMPLATE_CACHE_TTL
+  name: KIE_SERVER_CONTROLLER_TEMPLATE_CACHE_TTL
   value: "60000"
   required: false
+- displayName: Enable OpenShift Integration [Tech Preview]
+  description: If set to true, turns on OpenShift integration feature (Sets the org.kie.workbench.controller.openshift.enabled system property)
+  name: KIE_WORKBENCH_CONTROLLER_OPENSHIFT_ENABLED
+  value: "false"
+  required: false
 ## OpenShift Enhancement END
 - displayName: ImageStream Namespace
   description: Namespace in which the ImageStreams for Red Hat Middleware images are
@@ -657,12 +657,12 @@ objects:
           - name: KIE_MBEANS
             value: "${KIE_MBEANS}"
 ## OpenShift Enhancement BEGIN
-          - name: KIE_CONTROLLER_OCP_ENABLED
-            value: "${KIE_CONTROLLER_OCP_ENABLED}"
-          - name: KIE_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE
-            value: "${KIE_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE}"
-          - name: KIE_CONTROLLER_TEMPLATE_CACHE_TTL
-            value: "${KIE_CONTROLLER_TEMPLATE_CACHE_TTL}"
+          - name: KIE_SERVER_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE
+            value: "${KIE_SERVER_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE}"
+          - name: KIE_SERVER_CONTROLLER_TEMPLATE_CACHE_TTL
+            value: "${KIE_SERVER_CONTROLLER_TEMPLATE_CACHE_TTL}"
+          - name: KIE_WORKBENCH_CONTROLLER_OPENSHIFT_ENABLED
+            value: "${KIE_WORKBENCH_CONTROLLER_OPENSHIFT_ENABLED}"
 ## OpenShift Enhancement END
           - name: KIE_SERVER_CONTROLLER_USER
             value: "${KIE_SERVER_CONTROLLER_USER}"

templates/rhpam73-managed.yaml

@@ -24,7 +24,7 @@ message: |-
               Username: ${KIE_ADMIN_USER}
               Password: ${KIE_ADMIN_PWD}
 
-          Both sets of KIE servers are configured with the username/password
+          KIE servers are configured with the username/password
 
               Username: ${KIE_SERVER_USER}
               Password: ${KIE_SERVER_PWD}
@@ -97,21 +97,21 @@ parameters:
   generate: expression
   required: false
 ## OpenShift Enhancement BEGIN
-- displayName: Enable OpenShift Integration [Tech Preview]
-  description: If set to true, turns on OpenShift integration feature (Sets the org.kie.workbench.controller.openshift.enabled system property)
-  name: KIE_CONTROLLER_OCP_ENABLED
-  value: "true"
-  required: false
 - displayName: Prefer KIE Server OpenShift Service [Tech Preview]
   description: Enables connection to KIE Server via OpenShift internal Service endpoint (Sets the org.kie.server.controller.openshift.prefer.kieserver.service system property)
-  name: KIE_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE
+  name: KIE_SERVER_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE
   value: "false"
   required: false
 - displayName: KIE ServerTemplate Cache TTL [Tech Preview]
   description: KIE ServerTemplate Cache TTL in milliseconds (Sets the org.kie.server.controller.template.cache.ttl system property)
-  name: KIE_CONTROLLER_TEMPLATE_CACHE_TTL
+  name: KIE_SERVER_CONTROLLER_TEMPLATE_CACHE_TTL
   value: "60000"
   required: false
+- displayName: Enable OpenShift Integration [Tech Preview]
+  description: If set to true, turns on OpenShift integration feature (Sets the org.kie.workbench.controller.openshift.enabled system property)
+  name: KIE_WORKBENCH_CONTROLLER_OPENSHIFT_ENABLED
+  value: "true"
+  required: false
 ## OpenShift Enhancement END
 - displayName: ImageStream Namespace
   description: Namespace in which the ImageStreams for Red Hat Middleware images are
@@ -759,12 +759,12 @@ objects:
           - name: MAVEN_REPO_PASSWORD
             value: "${MAVEN_REPO_PASSWORD}"
 ## OpenShift Enhancement BEGIN
-          - name: KIE_CONTROLLER_OCP_ENABLED
-            value: "${KIE_CONTROLLER_OCP_ENABLED}"
-          - name: KIE_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE
-            value: "${KIE_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE}"
-          - name: KIE_CONTROLLER_TEMPLATE_CACHE_TTL
-            value: "${KIE_CONTROLLER_TEMPLATE_CACHE_TTL}"
+          - name: KIE_SERVER_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE
+            value: "${KIE_SERVER_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE}"
+          - name: KIE_SERVER_CONTROLLER_TEMPLATE_CACHE_TTL
+            value: "${KIE_SERVER_CONTROLLER_TEMPLATE_CACHE_TTL}"
+          - name: KIE_WORKBENCH_CONTROLLER_OPENSHIFT_ENABLED
+            value: "${KIE_WORKBENCH_CONTROLLER_OPENSHIFT_ENABLED}"
 ## OpenShift Enhancement END
           - name: KIE_SERVER_CONTROLLER_USER
             value: "${KIE_SERVER_CONTROLLER_USER}"

templates/rhpam73-prod-immutable-monitor.yaml

@@ -98,21 +98,21 @@ parameters:
   generate: expression
   required: false
 ## OpenShift Enhancement BEGIN
-- displayName: Enable OpenShift Integration
-  description: If set to true, turns on OpenShift integration feature (Sets the org.kie.workbench.controller.openshift.enabled system property)
-  name: KIE_CONTROLLER_OCP_ENABLED
-  value: "false"
-  required: false
-- displayName: Prefer KIE Server OpenShift Service
+- displayName: Prefer KIE Server OpenShift Service [Tech Preview]
   description: Enables connection to KIE Server via OpenShift internal Service endpoint (Sets the org.kie.server.controller.openshift.prefer.kieserver.service system property)
-  name: KIE_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE
+  name: KIE_SERVER_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE
   value: "false"
   required: false
-- displayName: KIE ServerTemplate Cache TTL
+- displayName: KIE ServerTemplate Cache TTL [Tech Preview]
   description: KIE ServerTemplate Cache TTL in milliseconds (Sets the org.kie.server.controller.template.cache.ttl system property)
-  name: KIE_CONTROLLER_TEMPLATE_CACHE_TTL
+  name: KIE_SERVER_CONTROLLER_TEMPLATE_CACHE_TTL
   value: "60000"
   required: false
+- displayName: Enable OpenShift Integration [Tech Preview]
+  description: If set to true, turns on OpenShift integration feature (Sets the org.kie.workbench.controller.openshift.enabled system property)
+  name: KIE_WORKBENCH_CONTROLLER_OPENSHIFT_ENABLED
+  value: "false"
+  required: false
 ## OpenShift Enhancement END
 - displayName: ImageStream Namespace
   description: Namespace in which the ImageStreams for Red Hat Middleware images are
@@ -633,12 +633,12 @@ objects:
           - name: EXTERNAL_MAVEN_REPO_PASSWORD
             value: "${MAVEN_REPO_PASSWORD}"
 ## OpenShift Enhancement BEGIN
-          - name: KIE_CONTROLLER_OCP_ENABLED
-            value: "${KIE_CONTROLLER_OCP_ENABLED}"
-          - name: KIE_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE
-            value: "${KIE_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE}"
-          - name: KIE_CONTROLLER_TEMPLATE_CACHE_TTL
-            value: "${KIE_CONTROLLER_TEMPLATE_CACHE_TTL}"
+          - name: KIE_SERVER_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE
+            value: "${KIE_SERVER_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE}"
+          - name: KIE_SERVER_CONTROLLER_TEMPLATE_CACHE_TTL
+            value: "${KIE_SERVER_CONTROLLER_TEMPLATE_CACHE_TTL}"
+          - name: KIE_WORKBENCH_CONTROLLER_OPENSHIFT_ENABLED
+            value: "${KIE_WORKBENCH_CONTROLLER_OPENSHIFT_ENABLED}"
 ## OpenShift Enhancement END
           - name: KIE_SERVER_CONTROLLER_USER
             value: "${KIE_SERVER_MONITOR_USER}"

templates/rhpam73-trial-ephemeral.yaml

@@ -119,21 +119,21 @@ parameters:
   value: ''
   required: false
 ## OpenShift Enhancement BEGIN
-- displayName: Enable OpenShift Integration
-  description: If set to true, turns on OpenShift integration feature (Sets the org.kie.workbench.controller.openshift.enabled system property)
-  name: KIE_CONTROLLER_OCP_ENABLED
-  value: "false"
-  required: false
-- displayName: Prefer KIE Server OpenShift Service
+- displayName: Prefer KIE Server OpenShift Service [Tech Preview]
   description: Enables connection to KIE Server via OpenShift internal Service endpoint (Sets the org.kie.server.controller.openshift.prefer.kieserver.service system property)
-  name: KIE_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE
+  name: KIE_SERVER_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE
   value: "false"
   required: false
-- displayName: KIE ServerTemplate Cache TTL
+- displayName: KIE ServerTemplate Cache TTL [Tech Preview]
   description: KIE ServerTemplate Cache TTL in milliseconds (Sets the org.kie.server.controller.template.cache.ttl system property)
-  name: KIE_CONTROLLER_TEMPLATE_CACHE_TTL
+  name: KIE_SERVER_CONTROLLER_TEMPLATE_CACHE_TTL
   value: "60000"
   required: false
+- displayName: Enable OpenShift Integration [Tech Preview]
+  description: If set to true, turns on OpenShift integration feature (Sets the org.kie.workbench.controller.openshift.enabled system property)
+  name: KIE_WORKBENCH_CONTROLLER_OPENSHIFT_ENABLED
+  value: "false"
+  required: false
 ## OpenShift Enhancement END
 - displayName: ImageStream Namespace
   description: Namespace in which the ImageStreams for Red Hat Middleware images are
@@ -525,12 +525,12 @@ objects:
           - name: KIE_MBEANS
             value: "${KIE_MBEANS}"
 ## OpenShift Enhancement BEGIN
-          - name: KIE_CONTROLLER_OCP_ENABLED
-            value: "${KIE_CONTROLLER_OCP_ENABLED}"
-          - name: KIE_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE
-            value: "${KIE_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE}"
-          - name: KIE_CONTROLLER_TEMPLATE_CACHE_TTL
-            value: "${KIE_CONTROLLER_TEMPLATE_CACHE_TTL}"
+          - name: KIE_SERVER_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE
+            value: "${KIE_SERVER_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE}"
+          - name: KIE_SERVER_CONTROLLER_TEMPLATE_CACHE_TTL
+            value: "${KIE_SERVER_CONTROLLER_TEMPLATE_CACHE_TTL}"
+          - name: KIE_WORKBENCH_CONTROLLER_OPENSHIFT_ENABLED
+            value: "${KIE_WORKBENCH_CONTROLLER_OPENSHIFT_ENABLED}"
 ## OpenShift Enhancement END
           - name: KIE_SERVER_CONTROLLER_USER
             value: "${KIE_SERVER_CONTROLLER_USER}"