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

Fixed deploying of che on OCP #6656

Merged
merged 5 commits into from
Oct 11, 2017
Merged

Conversation

sleshchenko
Copy link
Member

What does this PR do?

Different fixes of deploy script, especially deploying with OCP flavor.
Add ability to set OAUTH token for che-server

What issues does this PR fix or reference?

#6607

@sleshchenko sleshchenko added status/code-review This issue has a pull request posted for it and is awaiting code review completion by the community. target/branch Indicates that a PR will be merged into a branch other than master. labels Oct 10, 2017
@sleshchenko sleshchenko self-assigned this Oct 10, 2017
if [ ! -z "${OPENSHIFT_NAMESPACE_URL+x}" ]; then sed "s/ hostname-http:.*/ hostname-http: ${OPENSHIFT_NAMESPACE_URL}/" ; else cat -; fi | \
sed "s/ image:.*/ image: \"${CHE_IMAGE_SANITIZED}\"/" | \
sed "s/ imagePullPolicy:.*/ imagePullPolicy: \"${IMAGE_PULL_POLICY}\"/" | \
sed "s| keycloak-oso-endpoint:.*| keycloak-oso-endpoint: ${KEYCLOAK_OSO_ENDPOINT}|" | \
sed "s| keycloak-github-endpoint:.*| keycloak-github-endpoint: ${KEYCLOAK_GITHUB_ENDPOINT}|" | \
sed "s/ keycloak-disabled:.*/ keycloak-disabled: \"${CHE_KEYCLOAK_DISABLED}\"/" | \
sed "s| CHE_INFRA_OPENSHIFT_PROJECT:.*| CHE_INFRA_OPENSHIFT_PROJECT: ${CHE_INFRA_OPENSHIFT_PROJECT}|" | \
Copy link
Contributor

@riuvshin riuvshin Oct 10, 2017

Choose a reason for hiding this comment

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

are these lines needed only for ocp flavor? not for minishift or osio ?

Copy link
Member Author

Choose a reason for hiding this comment

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

For minishift and osio these lines already are there

Copy link
Member

Choose a reason for hiding this comment

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

@sleshchenko I guess for osio flavor OAUTH__TOKEN / USERNAME / PASSWORD vars are not set deliberately, so that default service account token would be used for object creation in -che namespace, right ?

Copy link
Contributor

Choose a reason for hiding this comment

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

KEWL

Copy link
Member Author

@sleshchenko sleshchenko Oct 10, 2017

Choose a reason for hiding this comment

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

@ibuziuk you're right. I think it is useful only for OCP and minishift flavors. So, now for OSIO service account will be used for objects creation in the same project. And later, I believe, we'll implement using of users' OpenShift tokens to create workspaces' objects in different projects.
I am not sure how it will work for OCP and minishift but now it is implemented by using user token or credentials.

Copy link
Member

Choose a reason for hiding this comment

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

sounds good. Tested on osio and all works just fine. +1 to apply

@benoitf benoitf added the kind/task Internal things, technical debt, and to-do tasks to be performed. label Oct 10, 2017
@codenvy-ci
Copy link

@codenvy-ci
Copy link

In some cases OpenShift API responses that config map is not valid.
Maybe it is because of version of APIs. It is a problem for OCP instance with openshift v3.5.5.31 and kubernetes v1.5.2+43a9be4
…ill be created for OCP and Minishift flavors
@sleshchenko sleshchenko merged commit 7e70804 into eclipse-che:spi Oct 11, 2017
@sleshchenko sleshchenko deleted the CHE-6607 branch October 11, 2017 06:27
@benoitf benoitf removed the status/code-review This issue has a pull request posted for it and is awaiting code review completion by the community. label Oct 11, 2017
@skabashnyuk skabashnyuk added this to the 6.0.0-M1 milestone Oct 19, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/task Internal things, technical debt, and to-do tasks to be performed. target/branch Indicates that a PR will be merged into a branch other than master.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants