Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 3 commits into from
Jan 30, 2020
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a63906
[RHPAM-2522] - Provide usable way of setting extensions image name an…
swati-kale Jan 28, 2020
985c4fd
Removed "default" for extension images - Minor fix
swati-kale Jan 28, 2020
e12459b
[RHPAM-2522] - Provide usable way of setting extensions image named n…
swati-kale Jan 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
44 changes: 44 additions & 0 deletions deploy/ui/form.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1122,6 +1122,50 @@
"displayWhen": "external",
"visible": false,
"fields": [
{
bmozaffa marked this conversation as resolved.
Show resolved Hide resolved
"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[*].build",
"originalJsonPath": "$.spec.objects.servers[*].build",
"fields": [
{
swati-kale marked this conversation as resolved.
Show resolved Hide resolved
"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.",
"default": "rhpam-kieserver-library=org.openshift.quickstarts:rhpam-kieserver-library:1.5.0-SNAPSHOT"
swati-kale marked this conversation as resolved.
Show resolved Hide resolved
},
{
"label": "Extension image stream tag namespace",
swati-kale marked this conversation as resolved.
Show resolved Hide resolved
"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.",
"default": "rhpam-kieserver-library=org.openshift.quickstarts:rhpam-kieserver-library:1.5.0-SNAPSHOT"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same than above.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@spolti changes are done.

},
{
"label": "Extension image install Dir",
swati-kale marked this conversation as resolved.
Show resolved Hide resolved
"type": "text",
"required": false,
"jsonPath": "$.spec.objects.servers[*].build.extensionImageInstallDir",
"description": "scription: 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).",
"default": "rhpam-kieserver-library=org.openshift.quickstarts:rhpam-kieserver-library:1.5.0-SNAPSHOT"
swati-kale marked this conversation as resolved.
Show resolved Hide resolved
}
]
}
]
},
{
"label": "Driver",
"type": "text",
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-20200128170441-c487bc6a3abd
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
Expand Down Expand Up @@ -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-20200128170441-c487bc6a3abd
github.com/RHsyseng/operator-utils => github.com/RHsyseng/operator-utils v0.0.0-20200108204558-82090ef57586

)
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-20200128170441-c487bc6a3abd h1:Qaf0VI673zpb5QIodUZ0KkVINrkB+nkOzzBn44+KJyw=
github.com/RHsyseng/console-cr-form v0.0.0-20200128170441-c487bc6a3abd/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=
Expand Down
2 changes: 1 addition & 1 deletion vendor/github.com/RHsyseng/console-cr-form/pkg/web/packrd/packed-packr.go
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-20200128170441-c487bc6a3abd => github.com/RHsyseng/console-cr-form v0.0.0-20200128170441-c487bc6a3abd
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
Expand Down Expand Up @@ -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
Expand Down