local-it/dashboard
0
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'main' into 45-allow-database-to-have-external-apps

Browse source
This commit is contained in:
Mart van Santen 2022-10-06 16:51:38 +08:00
commit 4f8455c675
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
config.py
View file

@ -15,3 +15,8 @@ KRATOS_PUBLIC_URL = str(os.environ.get("KRATOS_PUBLIC_URL")) + "/"
SQLALCHEMY_DATABASE_URI = os.environ.get("DATABASE_URL") SQLALCHEMY_DATABASE_URI = os.environ.get("DATABASE_URL")
SQLALCHEMY_TRACK_MODIFICATIONS = False SQLALCHEMY_TRACK_MODIFICATIONS = False
# Set this to "true" to load the config from a Kubernetes serviceaccount
# running in a Kubernetes pod. Set it to "false" to load the config from the
# `KUBECONFIG` environment variable.
LOAD_INCLUSTER_CONFIG = os.environ.get("LOAD_INCLUSTER_CONFIG").lower() == "true"

3
docker-compose.yml
View file

@ -32,6 +32,9 @@ services:
- SECRET_KEY=$FLASK_SECRET_KEY - SECRET_KEY=$FLASK_SECRET_KEY
- HYDRA_CLIENT_SECRET=$HYDRA_CLIENT_SECRET - HYDRA_CLIENT_SECRET=$HYDRA_CLIENT_SECRET
- KUBECONFIG=/.kube/config - KUBECONFIG=/.kube/config
# Disable loading config from the service account
- LOAD_INCLUSTER_CONFIG=false
ports: ports:
- "5000:5000" - "5000:5000"
user: "${KUBECTL_UID}:${KUBECTL_GID}" user: "${KUBECTL_UID}:${KUBECTL_GID}"

7
helpers/kubernetes.py
View file

@ -14,12 +14,17 @@ from kubernetes.utils import create_from_yaml
from kubernetes.utils.create_from_yaml import FailToCreateError from kubernetes.utils.create_from_yaml import FailToCreateError
from flask import current_app from flask import current_app
from config import LOAD_INCLUSTER_CONFIG
# Load the kube config once # Load the kube config once
# #
# By default this loads whatever we define in the `KUBECONFIG` env variable, # By default this loads whatever we define in the `KUBECONFIG` env variable,
# otherwise loads the config from default locations, similar to what kubectl # otherwise loads the config from default locations, similar to what kubectl
# does. # does.
config.load_kube_config() if LOAD_INCLUSTER_CONFIG:
config.load_incluster_config()
else:
config.load_kube_config()
def create_variables_secret(app_slug, variables_filepath): def create_variables_secret(app_slug, variables_filepath):
"""Checks if a variables secret for app_name already exists, generates it if necessary. """Checks if a variables secret for app_name already exists, generates it if necessary.