Merge branch 'AOEpeople-master'

Author: hjacobs

README.rst

@@ -16,7 +16,15 @@ Deployments are interchangeable by statefulset for this whole guide.
 
 It will scale the deployment's replicas to zero if all of the following conditions are met:
 
-* current time is not part of the "uptime" schedule (annotation ``downscaler/uptime``) or current time is part of the "downtime" schedule (``downscaler/downtime``)
+* current time is not part of the "uptime" schedule or current time is part of the "downtime" schedule. The schedules are being evaluated in following order: 
+    * ``downscaler/downtime`` annotation on the deployment/stateful set
+    * ``downscaler/uptime`` annotation on the deployment/stateful set
+    * ``downscaler/downtime`` annotation on the deployment/stateful set's namespace
+    * ``downscaler/uptime`` annotation on th deployment/stateful set's namespace
+    * ``--default-uptime`` cli argument
+    * ``--default-downtime`` cli argument
+    * ``DEFAULT_UPTIME`` environment variable
+    * ``DEFAULT_DOWNTIME`` environment variable
 * the deployment's namespace is not part of the exclusion list (``kube-system`` is excluded by default)
 * the deployment's name is not part of the exclusion list
 * the deployment is not marked for exclusion (annotation ``downscaler/exclude: "true"``)
@@ -93,6 +101,27 @@ Available command line options:
 ``--exclude-statefulsets``
     Exclude specific statefulsets from statefulsets, can also be configured via environment variable ``EXCLUDE_STATEFULSETS``
 
+Namespace Defaults
+==================
+
+``DEFAULT_UPTIME``, ``DEFAULT_DOWNTIME``, ``FORCE_UPTIME`` and exclusion can also be configured using Namespace annotations. Where configured these values supersede the other global default values.
+
+.. code-block:: yaml
+
+    apiVersion: v1
+    kind: Namespace
+    metadata:
+        name: foo
+        labels:
+            name: foo
+        annotations:
+            downscaler/uptime: Mon-Sun 06:00-21:00 Europe/Berlin
+
+Following annotations are supported on the Namespace level: 
+* ``downscaler/uptime``
+* ``downscaler/downtime``
+* ``downscaler/force-uptime``
+* ``downscaler/exclude``
 
 Contributing
 ============

helm-chart/templates/clusterrole.yaml

@@ -29,4 +29,11 @@ rules:
   - list
   - update
   - patch
+- apiGroups:
+  - ""
+  resources:
+  - namespaces
+  verbs:
+  - get
+  - list
 {{- end -}}

helm-chart/templates/deployment.yaml

@@ -29,7 +29,7 @@ spec:
         - --interval={{ .Values.interval }}
         {{- if .Values.namespace}}
         {{- if .Values.namespace.active_in}}
-        "- --namespace="{{ .Values.namespace.active_in }}
+        - --namespace={{ .Values.namespace.active_in }}
         {{- end }}
         {{- end }}
         {{ if .Values.debug.enable }}- --debug{{end }}

kube_downscaler/helper.py

@@ -40,6 +40,6 @@ def get_kube_api():
         config = pykube.KubeConfig.from_service_account()
     except FileNotFoundError:
         # local testing
-        config = pykube.KubeConfig.from_file(os.path.expanduser('~/.kube/config'))
+        config = pykube.KubeConfig.from_file(os.getenv('KUBECONFIG', os.path.expanduser('~/.kube/config')))
     api = pykube.HTTPClient(config)
     return api

kube_downscaler/scaler.py

@@ -12,6 +12,8 @@
 ORIGINAL_REPLICAS_ANNOTATION = 'downscaler/original-replicas'
 FORCE_UPTIME_ANNOTATION = 'downscaler/force-uptime'
 EXCLUDE_ANNOTATION = 'downscaler/exclude'
+UPTIME_ANNOTATION = 'downscaler/uptime'
+DOWNTIME_ANNOTATION = 'downscaler/downtime'
 
 
 def within_grace_period(deploy, grace_period: int):
@@ -48,8 +50,8 @@ def autoscale_resource(resource: pykube.objects.NamespacedAPIObject,
                 downtime = "ignored"
                 is_uptime = True
             else:
-                uptime = resource.annotations.get('downscaler/uptime', default_uptime)
-                downtime = resource.annotations.get('downscaler/downtime', default_downtime)
+                uptime = resource.annotations.get(UPTIME_ANNOTATION, default_uptime)
+                downtime = resource.annotations.get(DOWNTIME_ANNOTATION, default_downtime)
                 is_uptime = helper.matches_time_spec(now, uptime) and not helper.matches_time_spec(now, downtime)
 
             original_replicas = resource.annotations.get(ORIGINAL_REPLICAS_ANNOTATION)
@@ -91,7 +93,19 @@ def autoscale_resources(api, kind, namespace: str,
     for resource in kind.objects(api, namespace=(namespace or pykube.all)):
         if resource.namespace in exclude_namespaces or resource.name in exclude_names:
             continue
-        autoscale_resource(resource, default_uptime, default_downtime, forced_uptime, dry_run, now, grace_period)
+
+        # Override defaults with (optional) annotations from Namespace
+        namespace_obj = pykube.Namespace.objects(api).get_by_name(resource.namespace)
+
+        if namespace_obj.annotations.get(EXCLUDE_ANNOTATION, 'false').lower() != 'false':
+            logger.debug('Namespace %s was excluded (because of namespace annotation)', namespace)
+            continue
+
+        default_uptime_for_namespace = namespace_obj.annotations.get(UPTIME_ANNOTATION, default_uptime)
+        default_downtime_for_namespace = namespace_obj.annotations.get(DOWNTIME_ANNOTATION, default_downtime)
+        forced_uptime_for_namespace = namespace_obj.annotations.get(FORCE_UPTIME_ANNOTATION, forced_uptime)
+
+        autoscale_resource(resource, default_uptime_for_namespace, default_downtime_for_namespace, forced_uptime_for_namespace, dry_run, now, grace_period)
 
 
 def scale(namespace: str, default_uptime: str, default_downtime: str, kinds: FrozenSet[str],