Merge branch 'master' into feature/procfile-structure-on-app

.github/PULL_REQUEST_TEMPLATE

@@ -4,5 +4,5 @@ requires deis/workflow#1234
 requires deis/workflow-e2e#5678
 
 
-[docs]: https://github.com/deis/workflow
-[e2e]: https://github.com/deis/workflow-e2e
+[docs]: https://github.com/deisthree/workflow
+[e2e]: https://github.com/deisthree/workflow-e2e

.travis.yml

@@ -0,0 +1,7 @@
+sudo: required
+
+services:
+  - docker
+
+script:
+  make test

Makefile

@@ -58,7 +58,7 @@ test-functional:
 	@echo "Implement functional tests in _tests directory"
 
 test-integration:
-	@echo "Check https://github.com/deis/workflow-e2e for the complete integration test suite"
+	@echo "Check https://github.com/deisthree/workflow-e2e for the complete integration test suite"
 
 upload-coverage:
 	$(eval CI_ENV := $(shell curl -s https://codecov.io/env | bash))

README.md

@@ -1,3 +1,4 @@
+
 # Deis Controller
 
 [![Build Status](https://ci.deis.io/job/controller/badge/icon)](https://ci.deis.io/job/controller)
@@ -7,7 +8,7 @@
 
 Deis (pronounced DAY-iss) Workflow is an open source Platform as a Service (PaaS) that adds a developer-friendly layer to any [Kubernetes](http://kubernetes.io) cluster, making it easy to deploy and manage applications on your own servers.
 
-For more information about the Deis Workflow, please visit the main project page at https://github.com/deis/workflow.
+For more information about the Deis Workflow, please visit the main project page at https://github.com/deisthree/workflow.
 
 We welcome your input! If you have feedback, please [submit an issue][issues]. If you'd like to participate in development, please read the "Development" section below and [submit a pull request][prs].
 
@@ -75,17 +76,9 @@ After the `make deploy` finishes, a new pod will be launched but may not be runn
 kubectl get pod --namespace=deis -w | grep deis-controller
 ```
 
-## License
-
-Copyright 2013, 2014, 2015, 2016 Engine Yard, Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at <http://www.apache.org/licenses/LICENSE-2.0>
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
-
-
 [install-k8s]: https://kubernetes.io/docs/setup/pick-right-solution
-[issues]: https://github.com/deis/controller/issues
-[prs]: https://github.com/deis/controller/pulls
-[workflow]: https://github.com/deis/workflow
+[issues]: https://github.com/deisthree/controller/issues
+[prs]: https://github.com/deisthree/controller/pulls
+[workflow]: https://github.com/deisthree/workflow
 [Docker]: https://www.docker.com/
+[v2.18]: https://github.com/deisthree/workflow/releases/tag/v2.18.0

charts/controller/Chart.yaml

@@ -1,5 +1,5 @@
 name: controller
-home: https://github.com/deis/controller
+home: https://github.com/deisthree/controller
 version: <Will be populated by the ci before publishing the chart>
 description: Deis Workflow Controller (API).
 maintainers:

rootfs/api/serializers.py

@@ -247,7 +247,7 @@ def validate_values(self, data):
             if key == 'HEALTHCHECK_URL':
                 # Only Path information is supported, not query / anchor or anything else
                 # Path is the only thing Kubernetes supports right now
-                # See https://github.com/deis/controller/issues/774
+                # See https://github.com/deisthree/controller/issues/774
                 uri = urlparse(value)
 
                 if not uri.path:

rootfs/api/tests/test_app_settings.py

@@ -276,7 +276,7 @@ def test_settings_labels(self, mock_requests):
         base_labels = {
             'label':
                 {
-                    'git_repo': 'https://github.com/deis/controller',
+                    'git_repo': 'https://github.com/deisthree/controller',
                     'team': 'frontend',
                     'empty': ''
                 }

rootfs/api/tests/test_auth.py

@@ -378,5 +378,5 @@ def test_regenerate(self):
     def test_auth_no_ldap_by_default(self, mock_logger):
         """Ensure that LDAP authentication is disabled by default."""
         self.test_auth()
-        # NOTE(bacongobbler): Using https://github.com/deis/controller/issues/1189 as a test case
+        # NOTE(bacongobbler): Using https://github.com/deisthree/controller/issues/1189 as a test case
         mock_logger.warning.assert_not_called()

rootfs/api/tests/test_config.py

@@ -342,7 +342,7 @@ def test_admin_can_create_config_on_other_apps(self, mock_requests):
     def test_config_owner_is_requesting_user(self, mock_requests):
         """
         Ensure that setting the config value is owned by the requesting user
-        See https://github.com/deis/deis/issues/2650
+        See https://github.com/deisthree/deis/issues/2650
         """
         response = self.test_admin_can_create_config_on_other_apps()
         self.assertEqual(response.data['owner'], self.user.username)

rootfs/api/tests/test_domain.py

@@ -237,7 +237,7 @@ def test_delete_domain_does_not_exist(self):
         self.assertEqual(response.status_code, 404)
 
     def test_delete_domain_does_not_remove_latest(self):
-        """https://github.com/deis/deis/issues/3239"""
+        """https://github.com/deisthree/deis/issues/3239"""
         url = '/v2/apps/{app_id}/domains'.format(app_id=self.app_id)
         test_domains = [
             'test-domain.example.com',
@@ -255,7 +255,7 @@ def test_delete_domain_does_not_remove_latest(self):
             Domain.objects.get(domain=test_domains[0])
 
     def test_delete_domain_does_not_remove_others(self):
-        """https://github.com/deis/deis/issues/3475"""
+        """https://github.com/deisthree/deis/issues/3475"""
         self.test_delete_domain_does_not_remove_latest()
         self.assertEqual(Domain.objects.all().count(), 2)
 

rootfs/api/tests/test_limits.py

@@ -64,7 +64,7 @@ def test_request_limit_memory(self, mock_requests):
         self.assertEqual(response.status_code, 200, response.data)
         self.assertIn('memory', response.data)
         self.assertEqual(response.data['memory'], {})
-        # regression test for https://github.com/deis/deis/issues/1563
+        # regression test for https://github.com/deisthree/deis/issues/1563
         self.assertNotIn('"', response.data['memory'])
 
         # set an initial limit
@@ -105,7 +105,7 @@ def test_request_limit_memory(self, mock_requests):
         self.assertIn('web', memory)
         self.assertEqual(memory['web'], '1G')
 
-        # regression test for https://github.com/deis/deis/issues/1613
+        # regression test for https://github.com/deisthree/deis/issues/1613
         # ensure that config:set doesn't wipe out previous limits
         body = {'values': json.dumps({'NEW_URL2': 'http://localhost:8080/'})}
         response = self.client.post(url, body)
@@ -193,7 +193,7 @@ def test_request_limit_cpu(self, mock_requests):
         self.assertEqual(response.status_code, 200, response.data)
         self.assertIn('cpu', response.data)
         self.assertEqual(response.data['cpu'], {})
-        # regression test for https://github.com/deis/deis/issues/1563
+        # regression test for https://github.com/deisthree/deis/issues/1563
         self.assertNotIn('"', response.data['cpu'])
 
         # set an initial limit

rootfs/api/tests/test_pods.py

@@ -325,7 +325,7 @@ def test_container_str(self, mock_requests):
             self.assertRegex(pod['name'], app_id + '-(worker|web)-[0-9]{8,10}-[a-z0-9]{5}')
 
     def test_pod_command_format(self, mock_requests):
-        # regression test for https://github.com/deis/deis/pull/1285
+        # regression test for https://github.com/deisthree/deis/pull/1285
         app_id = self.create_app()
 
         # post a new build
@@ -580,7 +580,7 @@ def test_run_command_good(self, mock_requests):
 
     def test_run_not_fail_on_debug(self, mock_requests):
         """
-        do a run with DEIS_DEBUG on - https://github.com/deis/controller/issues/583
+        do a run with DEIS_DEBUG on - https://github.com/deisthree/controller/issues/583
         """
         env = EnvironmentVarGuard()
         env['DEIS_DEBUG'] = 'true'

rootfs/api/tests/test_tls.py

@@ -66,7 +66,7 @@ def test_tls_created_on_app_create(self, mock_requests):
         """
         Ensure that a TLS object is created for an App with default values.
 
-        See https://github.com/deis/controller/issues/1042
+        See https://github.com/deisthree/controller/issues/1042
         """
         app_id = self.create_app()
         response = self.client.get('/v2/apps/{}/tls'.format(app_id))

rootfs/dev_requirements.txt

@@ -2,14 +2,14 @@
 coverage==4.4.1
 
 # Run "make test-style" to check python syntax and style
-flake8==3.3.0
+flake8==3.4.1
 
 # code coverage report at https://codecov.io/github/deis/controller
 codecov==2.0.9
 
 # mock out python-requests, mostly k8s
 # requests-mock==1.3.0
-git+https://github.com/deis/requests-mock.git@class_adapter#egg=request_mock
+git+https://github.com/deisthree/requests-mock.git@class_adapter#egg=request_mock
 
 # tail a log and pipe into tbgrep to find all tracebacks
 tbgrep==0.3.0

rootfs/requirements.txt

@@ -1,23 +1,23 @@
 # Deis controller requirements
 backoff==1.4.3
 Django==1.11.4
-django-auth-ldap==1.2.14
+django-auth-ldap==1.2.15
 django-cors-middleware==1.3.1
 django-guardian==1.4.9
-djangorestframework==3.6.3
+djangorestframework==3.6.4
 docker-py==1.10.6
 gunicorn==19.7.1
-idna==2.5
+idna==2.6
 jmespath==0.9.3
 jsonfield==2.0.2
 jsonschema==2.6.0
 morph==0.1.2
 ndg-httpsclient==0.4.2
 packaging==16.8
-pyasn1==0.2.3
-psycopg2==2.7.1
+pyasn1==0.3.2
+psycopg2==2.7.3
 pyldap==2.4.37
 pyOpenSSL==17.2.0
 pytz==2017.2
-requests==2.18.2
+requests==2.18.4
 requests-toolbelt==0.8.0

rootfs/scheduler/resources/pod.py

@@ -324,11 +324,11 @@ def _default_readiness_probe(self, container, build_type, port=None):
     http://kubernetes.io/docs/user-guide/pod-states/#container-probes
 
     /runner/init is the entry point of the slugrunner.
-    https://github.com/deis/slugrunner/blob/01eac53f1c5f1d1dfa7570bbd6b9e45c00441fea/rootfs/Dockerfile#L20
+    https://github.com/deisthree/slugrunner/blob/01eac53f1c5f1d1dfa7570bbd6b9e45c00441fea/rootfs/Dockerfile#L20
     Once it downloads the slug it starts running using `exec` which means the pid 1
     will point to the slug/application command instead of entry point once the application has
     started.
-    https://github.com/deis/slugrunner/blob/01eac53f1c5f1d1dfa7570bbd6b9e45c00441fea/rootfs/runner/init#L90
+    https://github.com/deisthree/slugrunner/blob/01eac53f1c5f1d1dfa7570bbd6b9e45c00441fea/rootfs/runner/init#L90
 
     This should be added only for the build pack apps when a custom liveness probe is not set to
     make sure that the pod is ready only when the slug is downloaded and started running.