Disable PVC creation for che-multiuser master #9236
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
akorneta
added
status/code-review
akorneta
requested review from
skabashnyuk,
riuvshin,
garagatyi and
sleshchenko
ghost
approved these changes
Mar 26, 2018
akorneta
force-pushed
the
CHE-9040
branch
2 times, most recently
from
96baae0
to
d5526bd
Compare
sleshchenko
approved these changes
Mar 26, 2018
deploy/openshift/deploy_che.sh
Outdated
| @@ -292,6 +292,10 @@ CHE_CONFIG_FILE_PATH=${CHE_CONFIG_FILE_PATH:-${DEFAULT_CHE_CONFIG_FILE_PATH}} | |||
| cat "${CHE_DEPLOYMENT_FILE_PATH}" | \ | |||
| sed "s/ image:.*/ image: \"${CHE_IMAGE_SANITIZED}\"/" | \ | |||
| sed "s/ imagePullPolicy:.*/ imagePullPolicy: \"${IMAGE_PULL_POLICY}\"/" | \ | |||
| if [[ "${CHE_MULTIUSER}" != "true" ]]; then | |||
| sed "s|#CHE_MASTER_PVC|- apiVersion: v1\n kind: PersistentVolumeClaim\n metadata:\n labels:\n app: che\n name: che-data-volume\n spec:\n accessModes:\n - ReadWriteOnce\n resources:\n requests:\n storage: 1Gi|" | \ | |||
There was a problem hiding this comment.
Is it possible to rewrite it in the following way?
CHE_MASTER_PVC="- apiVersion: v1\n
kind: PersistentVolumeClaim\n
metadata:\n
labels:\n
app: che\n
name: che-data-volume\n
spec:\n
accessModes:\n
- ReadWriteOnce\n
resources:\n
requests:\n
storage: 1Gi"
...
cat "${CHE_DEPLOYMENT_FILE_PATH}" | \
...
if [[ "${CHE_MULTIUSER}" != "true" ]]; then
sed "s|#CHE_MASTER_PVC|${CHE_MASTER_PVC}|" | \
sed "s| #CHE_MASTER_VOLUME_MOUNTS.*|${CHE_MASTER_VOLUME_MOUNTS}|" | \
sed "s| #CHE_MASTER_VOLUMES.*|${CHE_MASTER_VOLUMES}|"; \
else cat -; fi | \
inject_che_config "#CHE_MASTER_CONFIG" "${CHE_CONFIG_FILE_PATH}"
}
skabashnyuk
approved these changes
Mar 26, 2018
l0rd
approved these changes
Mar 26, 2018
garagatyi
reviewed
Mar 26, 2018
dockerfiles/che/entrypoint.sh
Outdated
| rm -rf ${CHE_DATA}/lib/* | ||
| mkdir -p ${CHE_DATA}/lib | ||
| cp -rf ${CHE_HOME}/lib/* "${CHE_DATA}"/lib | ||
| rm -rf ${CHE_DATA}/lib |
There was a problem hiding this comment.
Please, create an issue to remove this line after several releases. And update comment since it is out of date now.
garagatyi
approved these changes
Mar 26, 2018
|
@guydaichs @perspectivus1 please, review changes in helm deployment files |
|
ci-test |
|
Looks ok. @akorneta Can you test this on minikube? |
|
ci-test build report: |
|
@guydaichs sure. |
akorneta
removed
the
status/code-review
This was referenced Mar 28, 2018
Closed
5 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Removes backup of che-home/lib folder.
Disables che-data PVC creation for che-muliuser deployed on Kubernetes/OpenShift.
The motivation for these changes is that we want to be able to run simultaneously two Che masters and more. To achieve that we need to avoid usage of shared PV between these instances, because in the cases when PVs does not support RWX mode we will get an issue with deploying of Che on different nodes.
What issues does this PR fix or reference?
#9040