Merge remote-tracking branch 'teamhephy/master' into issue/fix-objecstorage-keyfile-in-namespaces

Author: Cryptophobia

Makefile

@@ -1,6 +1,6 @@
 # If DEIS_REGISTRY is not set, try to populate it from legacy DEV_REGISTRY
 DEIS_REGISTRY ?= $(DEV_REGISTRY)
-IMAGE_PREFIX ?= deis
+IMAGE_PREFIX ?= hephy
 COMPONENT ?= controller
 SHORT_NAME ?= $(COMPONENT)
 

README.md

@@ -1,14 +1,13 @@
 
 # Deis Controller
 
-[![Build Status](https://ci.deis.io/job/controller/badge/icon)](https://ci.deis.io/job/controller)
+[![Build Status](https://travis-ci.org/teamhephy/controller.svg?branch=master)](https://travis-ci.org/teamhephy/controller)
 [![codecov.io](https://codecov.io/github/deis/controller/coverage.svg?branch=master)](https://codecov.io/github/deis/controller?branch=master)
 [![Docker Repository on Quay](https://quay.io/repository/deisci/controller/status "Docker Repository on Quay")](https://quay.io/repository/deisci/controller)
-[![Dependency Status](https://www.versioneye.com/user/projects/5863f1de6f4bf900128fa95a/badge.svg?style=flat)](https://www.versioneye.com/user/projects/5863f1de6f4bf900128fa95a)
 
 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/deisthree/workflow.
+For more information about the Deis Workflow, please visit the main project page at https://github.com/teamhephy/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].
 
@@ -47,7 +46,7 @@ You'll want to test your code changes interactively in a working Kubernetes clus
 
 ### Workflow Installation
 
-After you have a working Kubernetes cluster, you're ready to [install Workflow](https://deis.com/docs/workflow/installing-workflow/).
+After you have a working Kubernetes cluster, you're ready to [install Workflow](https://docs.teamhephy.com/installing-workflow/).
 
 ## Testing Your Code
 
@@ -77,8 +76,8 @@ kubectl get pod --namespace=deis -w | grep deis-controller
 ```
 
 [install-k8s]: https://kubernetes.io/docs/setup/pick-right-solution
-[issues]: https://github.com/deisthree/controller/issues
-[prs]: https://github.com/deisthree/controller/pulls
-[workflow]: https://github.com/deisthree/workflow
+[issues]: https://github.com/teamhephy/controller/issues
+[prs]: https://github.com/teamhephy/controller/pulls
+[workflow]: https://github.com/teamhephy/workflow
 [Docker]: https://www.docker.com/
-[v2.18]: https://github.com/deisthree/workflow/releases/tag/v2.18.0
+[v2.18]: https://github.com/teamhephy/workflow/releases/tag/v2.21.4

charts/controller/Chart.yaml

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

charts/controller/templates/_helpers.tmpl

@@ -1,12 +1,21 @@
 {{/*
-Set apiVersion based on Kubernetes version
+Set apiVersion based on .Capabilities.APIVersions
 */}}
 {{- define "rbacAPIVersion" -}}
-{{- if lt .Capabilities.KubeVersion.Minor "6" -}}
-rbac.authorization.k8s.io/v1alpha1
-{{- else if (and (ge .Capabilities.KubeVersion.Minor "6") (le .Capabilities.KubeVersion.Minor "7")) -}}
+{{- if .Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1beta1" -}}
 rbac.authorization.k8s.io/v1beta1
+{{- else if .Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1alpha1" -}}
+rbac.authorization.k8s.io/v1alpha1
 {{- else -}}
 rbac.authorization.k8s.io/v1
 {{- end -}}
 {{- end -}}
+{{- define "APIVersion" -}}
+{{- if .Capabilities.APIVersions.Has "apps/v1" -}}
+apps/v1
+{{- else if .Capabilities.APIVersions.Has "extensions/v1beta1" -}}
+extensions/v1beta1
+{{- else -}}
+apps/v1
+{{- end -}}
+{{- end -}}

charts/controller/templates/controller-clusterrole.yaml

@@ -38,15 +38,15 @@ rules:
 - apiGroups: [""]
   resources: ["resourcequotas"]
   verbs: ["get", "create"]
-- apiGroups: ["extensions"]
+- apiGroups: ["extensions", "apps"]
   resources: ["replicasets"]
   verbs: ["get", "list", "delete", "update"]
 - apiGroups: ["extensions", "apps"]
   resources: ["deployments"]
   verbs: ["get", "list", "create", "update", "delete"]
-- apiGroups: ["extensions"]
+- apiGroups: ["extensions", "apps"]
   resources: ["deployments/scale", "replicasets/scale"]
-  verbs: ["get", "update"]
+  verbs: ["get", "update", "patch"]
 - apiGroups: ["extensions", "autoscaling"]
   resources: ["horizontalpodautoscalers"]
   verbs: ["get", "list", "create", "update", "delete"]

charts/controller/templates/controller-deployment.yaml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: {{ template "APIVersion" . }}
 kind: Deployment
 metadata:
   name: deis-controller
@@ -128,6 +128,10 @@ spec:
                 secretKeyRef:
                   name: database-creds
                   key: password
+{{- if (.Values.deis_ignore_scheduling_failure) }}
+            - name: DEIS_IGNORE_SCHEDULING_FAILURE
+              value: "{{ .Values.deis_ignore_scheduling_failure }}"
+{{- end }}
             - name: RESERVED_NAMES
               value: "deis, deis-builder, deis-workflow-manager, grafana"
             - name: WORKFLOW_NAMESPACE

charts/controller/templates/controller-ingress-rule-http-80.yaml

@@ -2,7 +2,7 @@
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
-  namespace: "deis"
+  namespace: "{{ .Release.Namespace }}"
   name: "controller-api-server-ingress-http"
   labels:
     app: "controller"

rootfs/Dockerfile

@@ -1,4 +1,4 @@
-FROM quay.io/deis/base:v0.3.6
+FROM hephy/base:v0.4.1
 
 RUN adduser --system \
 	--shell /bin/bash \
@@ -17,6 +17,7 @@ RUN buildDeps='gcc libffi-dev libpq-dev libldap2-dev libsasl2-dev python3-dev py
         libpq5 \
         libldap-2.4 \
         python3-minimal \
+        python3-distutils \
         # cryptography package needs pkg_resources
         python3-pkg-resources && \
     ln -s /usr/bin/python3 /usr/bin/python && \

rootfs/Dockerfile.test

@@ -1,4 +1,4 @@
-FROM quay.io/deis/base:v0.3.6
+FROM hephy/base:v0.4.1
 
 RUN adduser --system \
 	--shell /bin/bash \
@@ -49,7 +49,7 @@ RUN buildDeps='gcc libffi-dev libpq-dev libldap2-dev libsasl2-dev python3-dev py
 WORKDIR /app
 
 # test-unit additions to the main Dockerfile
-ENV PGBIN=/usr/lib/postgresql/9.5/bin PGDATA=/var/lib/postgresql/data
+ENV PGBIN=/usr/lib/postgresql/10/bin PGDATA=/var/lib/postgresql/data
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         git \

rootfs/api/exceptions.py

@@ -1,9 +1,8 @@
 from django.http import Http404
 import logging
-from rest_framework.compat import set_rollback
 from rest_framework.exceptions import APIException, status
 from rest_framework.response import Response
-from rest_framework.views import exception_handler
+from rest_framework.views import set_rollback, exception_handler
 
 
 class HealthcheckException(APIException):