Skip to content

Commit

Permalink
Allow passing configuration via env vars
Browse files Browse the repository at this point in the history
  • Loading branch information
fridex committed Aug 28, 2018
1 parent d150a13 commit 4a94d92
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 47 deletions.
56 changes: 16 additions & 40 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 10 additions & 7 deletions thoth/common/openshift.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

"""Handling OpenShift and Kubernetes objects across project."""

import os
import logging
import requests

Expand Down Expand Up @@ -48,13 +49,15 @@ def __init__(self, *,
config.load_incluster_config()

self.ocp_client = DynamicClient(client.ApiClient(configuration=client.Configuration()))
self.frontend_namespace = frontend_namespace
self.middletier_namespace = middletier_namespace
self.backend_namespace = backend_namespace
self.infra_namespace = infra_namespace
self.kubernetes_api_url = kubernetes_api_url or 'https://kubernetes.default.svc.cluster.local'
self.kubernetes_verify_tls = kubernetes_verify_tls
self.openshift_api_url = openshift_api_url or 'https://openshift.default.svc.cluster.local'
self.frontend_namespace = frontend_namespace or os.getenv('THOTH_FRONTEND_NAMESPACE')
self.middletier_namespace = middletier_namespace or os.getenv('THOTH_MIDDLETIER_NAMESPACE')
self.backend_namespace = backend_namespace or os.getenv('THOTH_BACKEND_NAMESPACE')
self.infra_namespace = infra_namespace or os.getenv('THOTH_INFRA_NAMESPACE')
self.kubernetes_api_url = kubernetes_api_url or \
os.getenv('KUBERNETES_API_URL', 'https://kubernetes.default.svc.cluster.local')
self.kubernetes_verify_tls = bool(kubernetes_verify_tls or os.getenv('KUBERNETES_VERIFY_TLS', True))
self.openshift_api_url = openshift_api_url or \
os.getenv('OPENSHIFT_API_URL', 'https://openshift.default.svc.cluster.local')
self._token = token

@property
Expand Down

0 comments on commit 4a94d92

Please sign in to comment.