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.

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

[RHDM-375] - Remove controller environment variables from S2I templates #22

Merged
merged 1 commit into from Feb 9, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
49 changes: 0 additions & 49 deletions templates/rhdm70-kieserver-basic-s2i.yaml
Expand Up @@ -30,43 +30,6 @@ parameters:
from: "[a-zA-Z]{6}[0-9]{1}!"
generate: expression
required: false
- displayName: KIE Server Controller User
description: KIE server controller username (Sets the org.kie.server.controller.user
system property)
name: KIE_SERVER_CONTROLLER_USER
value: controllerUser
required: false
- displayName: KIE Server Controller Password
description: KIE server controller password (Sets the org.kie.server.controller.pwd
system property)
name: KIE_SERVER_CONTROLLER_PWD
from: "[a-zA-Z]{6}[0-9]{1}!"
generate: expression
required: false
- displayName: KIE server controller protocol
description: KIE server controller protocol (Used to set the org.kie.server.controller
system property)
name: KIE_SERVER_CONTROLLER_PROTOCOL
value: http
required: false
- displayName: KIE server controller service
description: KIE server controller service (Used to set the org.kie.server.controller
system property if host and port aren't set)
name: KIE_SERVER_CONTROLLER_SERVICE
value: ''
required: false
- displayName: KIE server controller host
description: KIE server controller host (Used to set the org.kie.server.controller
system property)
name: KIE_SERVER_CONTROLLER_HOST
example: my-app-controller-ocpuser.os.example.com
required: false
- displayName: KIE server controller port
description: KIE server controller port (Used to set the org.kie.server.controller
system property)
name: KIE_SERVER_CONTROLLER_PORT
example: '8080'
required: false
- displayName: KIE Admin User
description: KIE administrator username
name: KIE_ADMIN_USER
Expand Down Expand Up @@ -319,18 +282,6 @@ objects:
value: "${KIE_MBEANS}"
- name: KIE_SERVER_BYPASS_AUTH_USER
value: "${KIE_SERVER_BYPASS_AUTH_USER}"
- name: KIE_SERVER_CONTROLLER_PWD
value: "${KIE_SERVER_CONTROLLER_PWD}"
- name: KIE_SERVER_CONTROLLER_USER
value: "${KIE_SERVER_CONTROLLER_USER}"
- name: KIE_SERVER_CONTROLLER_PROTOCOL
value: "${KIE_SERVER_CONTROLLER_PROTOCOL}"
- name: KIE_SERVER_CONTROLLER_SERVICE
value: "${KIE_SERVER_CONTROLLER_SERVICE}"
- name: KIE_SERVER_CONTROLLER_HOST
value: "${KIE_SERVER_CONTROLLER_HOST}"
- name: KIE_SERVER_CONTROLLER_PORT
value: "${KIE_SERVER_CONTROLLER_PORT}"
- name: KIE_SERVER_HOST
valueFrom:
fieldRef:
Expand Down
49 changes: 0 additions & 49 deletions templates/rhdm70-kieserver-https-s2i.yaml
Expand Up @@ -32,43 +32,6 @@ parameters:
from: "[a-zA-Z]{6}[0-9]{1}!"
generate: expression
required: false
- displayName: KIE Server Controller User
description: KIE server controller username (Sets the org.kie.server.controller.user
system property)
name: KIE_SERVER_CONTROLLER_USER
value: controllerUser
required: false
- displayName: KIE Server Controller Password
description: KIE server controller password (Sets the org.kie.server.controller.pwd
system property)
name: KIE_SERVER_CONTROLLER_PWD
from: "[a-zA-Z]{6}[0-9]{1}!"
generate: expression
required: false
- displayName: KIE server controller protocol
description: KIE server controller protocol (Used to set the org.kie.server.controller
system property)
name: KIE_SERVER_CONTROLLER_PROTOCOL
value: http
required: false
- displayName: KIE server controller service
description: KIE server controller service (Used to set the org.kie.server.controller
system property if host and port aren't set)
name: KIE_SERVER_CONTROLLER_SERVICE
value: ''
required: false
- displayName: KIE server controller host
description: KIE server controller host (Used to set the org.kie.server.controller
system property)
name: KIE_SERVER_CONTROLLER_HOST
example: my-app-controller-ocpuser.os.example.com
required: false
- displayName: KIE server controller port
description: KIE server controller port (Used to set the org.kie.server.controller
system property)
name: KIE_SERVER_CONTROLLER_PORT
example: '8080'
required: false
- displayName: KIE Admin User
description: KIE administrator username
name: KIE_ADMIN_USER
Expand Down Expand Up @@ -384,18 +347,6 @@ objects:
value: "${KIE_MBEANS}"
- name: KIE_SERVER_BYPASS_AUTH_USER
value: "${KIE_SERVER_BYPASS_AUTH_USER}"
- name: KIE_SERVER_CONTROLLER_PWD
value: "${KIE_SERVER_CONTROLLER_PWD}"
- name: KIE_SERVER_CONTROLLER_USER
value: "${KIE_SERVER_CONTROLLER_USER}"
- name: KIE_SERVER_CONTROLLER_PROTOCOL
value: "${KIE_SERVER_CONTROLLER_PROTOCOL}"
- name: KIE_SERVER_CONTROLLER_SERVICE
value: "${KIE_SERVER_CONTROLLER_SERVICE}"
- name: KIE_SERVER_CONTROLLER_HOST
value: "${KIE_SERVER_CONTROLLER_HOST}"
- name: KIE_SERVER_CONTROLLER_PORT
value: "${KIE_SERVER_CONTROLLER_PORT}"
- name: KIE_SERVER_HOST
valueFrom:
fieldRef:
Expand Down