Skip to content
This repository has been archived by the owner on Jan 19, 2018. It is now read-only.

OpenShift to KubeShift #778

Merged
merged 1 commit into from
Aug 10, 2016
Merged

Conversation

cdrage
Copy link
Member

@cdrage cdrage commented Jul 22, 2016

An open PR to keep track of progress

TODO:

  • Refactor OpenShift provider to use KubeShift
  • Removes previous openshift.py tests
  • Create new tests for KubeShift / OpenShift

@cdrage cdrage force-pushed the openshift-to-kubeshift branch 9 times, most recently from e9ab1f7 to aae0e4e Compare July 29, 2016 15:38
@cdrage cdrage force-pushed the openshift-to-kubeshift branch 6 times, most recently from 8ff0186 to 0374d41 Compare August 4, 2016 15:30
@cdrage cdrage force-pushed the openshift-to-kubeshift branch 14 times, most recently from 8573d26 to f0ff91c Compare August 5, 2016 17:12

# Check the API url
url = self.api.cluster['server']
print url
Copy link
Contributor

Choose a reason for hiding this comment

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

delete

@cdrage cdrage force-pushed the openshift-to-kubeshift branch from f2fefb2 to bc69420 Compare August 9, 2016 20:05
from urllib import urlencode
from atomicapp.providers.lib.kubeshift.kubebase import KubeBase
from atomicapp.providers.lib.kubeshift.exceptions import KubeOpenshiftError
from atomicapp.constants import LOGGER_DEFAULT
Copy link
Contributor

@dustymabe dustymabe Aug 9, 2016

Choose a reason for hiding this comment

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

move LOGGER_DEFAULT to above import KubeBase so that it matches kubernetes.py

@cdrage cdrage force-pushed the openshift-to-kubeshift branch 3 times, most recently from fd38c0d to 098db0b Compare August 10, 2016 13:34
@dustymabe
Copy link
Contributor

can we have a better commit message than "refactor" ?

@cdrage
Copy link
Member Author

cdrage commented Aug 10, 2016

@dustymabe Yeah, I was going to update this after the code changes :)

@cdrage cdrage force-pushed the openshift-to-kubeshift branch 5 times, most recently from 8af1aaf to 543fef0 Compare August 10, 2016 14:31
@cdrage
Copy link
Member Author

cdrage commented Aug 10, 2016

Updated the PR with the OpenShift namespaces fix as per openshift/origin#10334


# Check if the namespace that the app is being deployed to is available
# DISABLED at the moment due to issues with OpenShift 1.3.0
# https://github.com/openshift/origin/issues/10334
Copy link
Contributor

Choose a reason for hiding this comment

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

remove the two lines of comments above

This commit converts the current OpenShift provider to use the
'KubeShift' library. Allowing OpenShift to use the universal library for
both Kubernetes and OpenShift, decreasing technical debt in learning how
each provider API communicates.

Tests are also added which cover a large majority of test scenarios for
the KubeShift library. Included is a new pytest plugin which allows
mocking an example HTTP server.
@cdrage cdrage force-pushed the openshift-to-kubeshift branch from 543fef0 to 1a37ab8 Compare August 10, 2016 15:41
@cdrage
Copy link
Member Author

cdrage commented Aug 10, 2016

#dotests

@dustymabe
Copy link
Contributor

I think we are good to go.. merge away

@coveralls
Copy link

Coverage Status

Coverage increased (+6.2%) to 64.302% when pulling 1a37ab8 on cdrage:openshift-to-kubeshift into d1686c2 on projectatomic:master.

@dustymabe
Copy link
Contributor

maybe remove WIP from title first

@cdrage
Copy link
Member Author

cdrage commented Aug 10, 2016

@dustymabe just going to run through a few last-minute tests and we'll be good to go :)

@cdrage cdrage changed the title [WIP] OpenShift to KubeShift OpenShift to KubeShift Aug 10, 2016
@cdrage cdrage merged commit 0a3939d into projectatomic:master Aug 10, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants