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

Author: Cryptophobia

.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)