Merge pull request #348 from swati-kale/RHPAM-2522

[RHPAM-2522] - Provide usable way of setting extensions image named namespace for external DB driver in Operator UI

deploy/crds/kieapp.crd.yaml

@@ -250,7 +250,7 @@ spec:
                                 description: Namespace within which the ImageStream definition for the image containing the drivers and configuration is located. Defaults to openshift namespace.
                               extensionImageInstallDir:
                                 type: string
-                                description: Full path to the directory within the extensions image where the extensions are located (e.g. install.sh, modules/, etc. Do not change this field unless you have sure about the changes that you is doing).
+                                description: Full path to the directory within the extensions image where the extensions are located (e.g. install.sh, modules/, etc.).
                               kieServerContainerDeployment:
                                 type: string
                                 description: The Maven GAV to deploy, e.g., rhpam-kieserver-library=org.openshift.quickstarts:rhpam-kieserver-library:1.5.0-SNAPSHOT

deploy/ui/form.json

@@ -1122,6 +1122,47 @@
                           "displayWhen": "external",
                           "visible": false,
                           "fields": [
+                            {
+                              "label": "Enable Extension image stream",
+                              "type": "checkbox",
+                              "required": false,
+                              "description": "When set to true will configure the KIE Server with Extension Image Stream.",
+                              "jsonPath": "$.spec.objects.servers[*].database.externalConfig.extensionImage",
+                              "originalJsonPath": "$.spec.objects.servers[*].database.externalConfig.extensionImage",
+                              "fields": [
+                                {
+                                  "label": "Enable Extension image stream",
+                                  "type": "fieldGroup",
+                                  "jsonPath": "$.spec.objects.servers[*].build",
+                                  "originalJsonPath": "$.spec.objects.servers[*].build",
+                                  "displayWhen": "true",
+                                  "visible": false,
+                                  "fields": [
+                                    {
+                                      "label": "Extension image stream tag",
+                                      "type": "text",
+                                      "required": true,
+                                      "jsonPath": "$.spec.objects.servers[*].build.extensionImageStreamTag",
+                                      "description": "ImageStreamTag definition for the image containing the drivers and configuration. For example, custom-driver-image:7.7.0."
+                                    },
+                                    {
+                                      "label": "Extension image stream namespace",
+                                      "type": "text",
+                                      "required": false,
+                                      "jsonPath": "$.spec.objects.servers[*].build.extensionImageStreamTagNamespace",
+                                      "description": "Namespace within which the ImageStream definition for the image containing the drivers and configuration is located. Defaults to openshift namespace."
+                                    },
+                                    {
+                                      "label": "Extension image install directory",
+                                      "type": "text",
+                                      "required": false,
+                                      "jsonPath": "$.spec.objects.servers[*].build.extensionImageInstallDir",
+                                      "description": "Full path to the directory within the extensions image where the extensions are located (e.g. install.sh, modules/, etc.)."
+                                    }
+                                  ]
+                                }
+                              ]
+                            },
                             {
                               "label": "Driver",
                               "type": "text",

go.mod

@@ -3,7 +3,7 @@ module github.com/kiegroup/kie-cloud-operator
 go 1.12
 
 require (
-	github.com/RHsyseng/console-cr-form v0.0.0-20191125212019-0b9d5493caf6
+	github.com/RHsyseng/console-cr-form v0.0.0-20200129200812-dc119cb0bd4d
 	github.com/RHsyseng/operator-utils v0.0.0-20200108204558-82090ef57586
 	github.com/blang/semver v3.5.1+incompatible
 	github.com/coreos/prometheus-operator v0.29.0
@@ -60,7 +60,7 @@ replace (
 
 // Pin RHsyseng library versions
 replace (
-	github.com/RHsyseng/console-cr-form => github.com/RHsyseng/console-cr-form v0.0.0-20191125212019-0b9d5493caf6
+	github.com/RHsyseng/console-cr-form => github.com/RHsyseng/console-cr-form v0.0.0-20200129200812-dc119cb0bd4d
 	github.com/RHsyseng/operator-utils => github.com/RHsyseng/operator-utils v0.0.0-20200108204558-82090ef57586
 
 )

go.sum

@@ -30,8 +30,8 @@ github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tN
 github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
-github.com/RHsyseng/console-cr-form v0.0.0-20191125212019-0b9d5493caf6 h1:Gru7Fbd2051P6/n6gPHoi18w3Ax7gURSoSsK7GMFEvU=
-github.com/RHsyseng/console-cr-form v0.0.0-20191125212019-0b9d5493caf6/go.mod h1:b1BUyQinnYJTvUGO4Yf+QqXy7PrBWT1CU6T85wDUobI=
+github.com/RHsyseng/console-cr-form v0.0.0-20200129200812-dc119cb0bd4d h1:XmCGuoQVbY5Jhy9O0jpxTiarpmZVHxgP0pqcMMWKYpU=
+github.com/RHsyseng/console-cr-form v0.0.0-20200129200812-dc119cb0bd4d/go.mod h1:b1BUyQinnYJTvUGO4Yf+QqXy7PrBWT1CU6T85wDUobI=
 github.com/RHsyseng/operator-utils v0.0.0-20200108204558-82090ef57586 h1:bHfsHIAh0nbiGzDWAvpRBJrNCjNmhqHlNUklpHds52w=
 github.com/RHsyseng/operator-utils v0.0.0-20200108204558-82090ef57586/go.mod h1:E+hCtYz+9UsXfAGnRjX2LGuaa5gSGNKHCVTmGZR79vY=
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=

vendor/modules.txt

@@ -13,7 +13,7 @@ github.com/Azure/go-autorest/autorest/date
 github.com/PuerkitoBio/purell
 # github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578
 github.com/PuerkitoBio/urlesc
-# github.com/RHsyseng/console-cr-form v0.0.0-20191125212019-0b9d5493caf6 => github.com/RHsyseng/console-cr-form v0.0.0-20191125212019-0b9d5493caf6
+# github.com/RHsyseng/console-cr-form v0.0.0-20200129200812-dc119cb0bd4d => github.com/RHsyseng/console-cr-form v0.0.0-20200129200812-dc119cb0bd4d
 github.com/RHsyseng/console-cr-form/pkg/web
 github.com/RHsyseng/console-cr-form/pkg/web/packrd
 # github.com/RHsyseng/operator-utils v0.0.0-20200108204558-82090ef57586 => github.com/RHsyseng/operator-utils v0.0.0-20200108204558-82090ef57586
@@ -103,8 +103,8 @@ github.com/gobuffalo/packd
 github.com/gobuffalo/packd/internal/takeon/github.com/markbates/errx
 # github.com/gobuffalo/packr/v2 v2.7.1 => github.com/gobuffalo/packr/v2 v2.2.0
 github.com/gobuffalo/packr/v2
-github.com/gobuffalo/packr/v2/file
 github.com/gobuffalo/packr/v2/file/resolver
+github.com/gobuffalo/packr/v2/file
 github.com/gobuffalo/packr/v2/jam/parser
 github.com/gobuffalo/packr/v2/plog
 github.com/gobuffalo/packr/v2/file/resolver/encoding/hex