Commit Graph

397 Commits (ba47c0b825fc92b0f5dcf277ba4361f2999bae9d)

Author SHA1 Message Date
Artem Zatsarynnyi ba47c0b825 Port AppStatesPreferenceCleaner to spi branch (#6611)
* Port AppStatesPreferenceCleaner from master branch. Class has been missed as a result of previous merges.

* Move AppStatesPreferenceCleaner to che-core-api-workspace.

* Move WorkspaceRemovedEvent and WorkspaceCreatedEvent to che-core-api-workspace-shared;
Move AppStatesPreferenceCleaner to che-core-api-user
2017-10-07 09:56:03 +03:00
Artem Zatsarynnyi 81bce959ce Merge branch 'che-multiuser' into spi 2017-10-02 14:59:55 +03:00
Sergii Kabashniuk 1f639c0557 Merge remote-tracking branch 'origin/master' into che-multiuser 2017-10-02 09:03:47 +03:00
Josh Pinkney 34ba429d58 Implemented getVersion in OpenShiftConnector (#6222)
* Implemented getVersion in OpenShiftConnector

Signed-off-by: jpinkney <josh.pinkney@mail.utoronto.ca>
2017-10-02 07:42:42 +02:00
Sergii Kabashniuk b9767355b7 Merge with master 2017-09-30 13:57:06 +03:00
jpinkney 6db2424a7a Removed unneeded code from top method 2017-09-29 17:11:54 +02:00
jpinkney e0f60000d5 Implement top method in OpenShiftConnector
Signed-off-by: jpinkney <josh.pinkney@mail.utoronto.ca>
2017-09-29 17:11:54 +02:00
jpinkney 7503f50e77 Added getSystemInfo into OpenShiftConnector
Signed-off-by: jpinkney <josh.pinkney@mail.utoronto.ca>
2017-09-29 17:09:50 +02:00
Florent BENOIT 430c1a32d7 Fix the issue when no exposed ports are defined in the docker image
Change-Id: I76fa7b6aaff552043e1e8cf2934527f491631b2a
Signed-off-by: Florent BENOIT <fbenoit@redhat.com>
2017-09-29 11:16:20 +02:00
Artem Zatsarynnyi 28c5193252 Merge commit 'da636d181c41a5602dbd5ced28474ad985df49c0' into spi 2017-09-28 12:15:59 +03:00
Sergii Kabashniuk 32ae31765e Merge remote-tracking branch 'origin/master' into che-multiuser 2017-09-28 08:35:45 +03:00
Florent BENOIT da636d181c Avoid NPE by checking if map are null and not only empty
https://github.com/redhat-developer/rh-che/issues/338

Change-Id: Ic760eef59be7fcaf47cb94ad83652892897d4d31
Signed-off-by: Florent BENOIT <fbenoit@redhat.com>
2017-09-28 07:01:49 +02:00
Sergii Kabashniuk 854f030260 Merge remote-tracking branch 'origin/master' into che-multiuser 2017-09-25 15:50:55 +03:00
Oleksandr Garagatyi 7c7e596fb7 Add possibility to disable DockerInstanceStopDetector (#6415)
It is needed for OpenShift infra where getting events
is not supported due to security limits.
To disable containers stop detector variable
CHE_DOCKER_ENABLE__CONTAINER__STOP__DETECTOR=false should be
defined.
Signed-off-by: Oleksandr Garagatyi <ogaragat@redhat.com>
2017-09-25 15:47:02 +03:00
Oleksii Kurinnyi 2b10bbf10c Merge remote-tracking branch 'origin' into che-multiuser
# Conflicts:
#	dashboard/src/app/index.module.ts
2017-09-25 15:18:19 +03:00
Oleksandr Garagatyi 4058f61ec1 CHE-6397: set missing environment context on machine start
Set environment context for a thread where logs of a machine are read.
Signed-off-by: Oleksandr Garagatyi <ogaragat@redhat.com>

Signed-off-by: Oleksandr Garagatyi <ogaragat@redhat.com>
2017-09-25 10:05:45 +03:00
Artem Zatsarynnyi 685def4d29 Merge branch 'master' into spi 2017-09-21 09:24:39 +03:00
Sergii Kabashniuk 546ba4e4ea Merge with master 2017-09-20 11:34:18 +03:00
Roman Iuvshyn 8e03d56bfb RELEASE: Set next development version (#6345) 2017-09-19 14:52:53 +03:00
Sergii Kabashniuk e7006e5ae4 Merge with master 2017-09-18 08:46:28 +03:00
Max Shaposhnik 38b5c83d23 Add test dependensies 2017-09-15 16:12:50 +03:00
Max Shaposhnik d2bfa4f7f4 Move permissions and authorization into separate module; 2017-09-14 17:03:43 +03:00
Artem Zatsarynnyi a07ffc3c70 Merge branch 'master' into spi 2017-09-14 15:48:40 +03:00
Ilya Buziuk 0bd960605e openshift.io-798 Checking only first 20 chars of tag in 'getImageStreamTagFromRepo' for long tags
Signed-off-by: Ilya Buziuk <ibuziuk@redhat.com>
2017-09-13 14:06:18 +02:00
Roman Nikitenko ed73a101dc CHE-5338. Clean up app state preference when workspace is removed
Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
2017-09-13 11:16:42 +03:00
Sergii Leshchenko 1ec0f6aaf4 CHE-6081 Make workspace files cleaning as infrastructure specific feature (#6193)
Add removing of OpenShift project when workspace is removed
2017-09-11 18:00:03 +03:00
Artem Zatsarynnyi 04be689c69 Merge branch 'master' into spi 2017-09-04 11:51:57 +03:00
Max Shaposhnik 7d3cf94a30 Merge with master 2017-08-23 14:08:07 +03:00
Roman Iuvshyn 2850a74a11 RELEASE: Set next development version (#6067) 2017-08-23 11:11:34 +03:00
Max Shaposhnik 2cab5980ef Merge with master 2017-08-23 10:35:31 +03:00
Oleksandr Garagatyi 041aff648c Merge branch 'master' into spi
Signed-off-by: Oleksandr Garagatyi <ogaragat@redhat.com>
2017-08-23 09:49:33 +03:00
Roman Nikitenko 0343393028 CHE-5829. Fix non-exhaustive switch statements
Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
2017-08-22 18:16:33 +03:00
Sergii Kabashniuk ff76657a9f Used Google Java Codestyle 2017-08-18 17:28:50 +03:00
Sergii Kabashniuk 6e9825c699 Used Google Java Codestyle 2017-08-18 17:16:54 +03:00
Sergii Kabashniuk 5b373e6cf5 Used Google Java Codestyle (#5851) 2017-08-18 17:00:58 +03:00
Max Shaposhnik 202ded08ec Merge branch 'master' into che-multiuser 2017-08-18 10:33:46 +03:00
Artem Zatsarynnyi 927755a882 Merge branch 'master' into spi 2017-08-17 17:16:47 +03:00
Artem Zatsarynnyi ce3873af82 Merge branch 'master' into spi 2017-08-17 17:16:04 +03:00
Ilya Buziuk ee09e10b84 Reverting #6019: Workaround for ImageStreamTags issue on OpenShift 3.6
Signed-off-by: Ilya Buziuk <ibuziuk@redhat.com>
2017-08-17 16:09:47 +02:00
Artem Zatsarynnyi a552e67a76 Merge branch 'master' into spi 2017-08-17 16:40:48 +03:00
Max Shaposhnik 68755ad511 Merge branch 'master' into che-multiuser 2017-08-17 16:13:12 +03:00
Artem Zatsarynnyi 51fed52707 Merge branch 'master' into spi 2017-08-17 15:21:26 +03:00
Angel Misevski 6792b2ba9b Workaround for ImageStreamTags issue on OpenShift 3.6
Minor adjustment to how image name is set when creating a
workspace on OpenShift.

On OpenShift 3.6, it seems that using an ImageStreamTag
in a Deployment spec causes the deployment to have null status,
which causes kubernetes-client to throw an NPE.

We still need to decide if this is to be a longer term solution,
and if removing ImageStreamTags completely is a good option

Signed-off-by: Angel Misevski <amisevsk@redhat.com>
2017-08-17 08:16:24 +02:00
Ilya Buziuk 5a2adf139d Changing deletion order during deployment cleaup (routes & services are going to be deleted first)
Signed-off-by: Ilya Buziuk <ibuziuk@redhat.com>
2017-08-16 20:09:38 +02:00
Ilya Buziuk 52b878e953 Do not scale down deployment before resource deletion. Removing watch pod logic (seems to be also broken after 3.6 osio update)
Signed-off-by: Ilya Buziuk <ibuziuk@redhat.com>
2017-08-16 16:07:05 +02:00
Angel Misevski 2cd0ab0b09 Fix OpenShiftConnector.inspectImage() to resolve issue in OS 3.6+
OpenShiftConnector.inspectImage() uses pods to figure out a workspaces
docker image. Previously, this was not a problem as it would match
the imagestream tag we create earlier. However, in OpenShift 3.6 and
higher, it seems like pods created by deployments use the sha256 of
the image as an identifier, and so this fails. This means that
workspaces fail to start due to imagestream not found.

To resolve this issue, we instead get the image name through the
deployment, which does have the correct value.

Signed-off-by: Angel Misevski <amisevsk@redhat.com>
2017-08-16 13:14:03 +02:00
Max Shaposhnik c8b92fcc74 Merge with master 2017-08-11 16:42:29 +03:00
Mykhailo Kuznietsov 69d5148385 Changed copyright owner to "Red Hat, Inc." in license headers (#5964)
Change license header contributor to Red Hat, Inc.
2017-08-11 10:46:58 +03:00
Max Shaposhnik 5acb5cf9e4 Merge with master and create multiuser readme 2017-08-09 14:53:11 +03:00
Oleksandr Garagatyi 8be2f0e4dc CHE-5871: Refactor DockerMachineStarter
Refactor DockerMachineStarter to clean it up and reduce
its responsibilities. Move container configuration applying
to InfrastructureProvisioners.
Move classes to different packages to create some structure and
reduce classes mess in a single package.
Uncomment some commented tests.
Signed-off-by: Oleksandr Garagatyi <ogaragat@redhat.com>
2017-08-09 11:35:32 +03:00