diff --git a/deployment/backend/backend.yaml b/deployment/backend/backend.yaml index 91620f8..46d71d1 100644 --- a/deployment/backend/backend.yaml +++ b/deployment/backend/backend.yaml @@ -157,8 +157,8 @@ spec: - name: STORAGE_SERVICE_PATH valueFrom: - configMapKeyRef: - name: storage-config + secretKeyRef: + name: storage-secret key: storage_url --- diff --git a/setup.py b/setup.py index 64f6dc5..289aa8d 100644 --- a/setup.py +++ b/setup.py @@ -27,6 +27,7 @@ ENV_VARIABLES = [ "POSTGRES_PASSWORD", "POSTGRES_DB", "REDIS_PASSWORD", + "STORAGE_URL", "STORAGE_TYPE", "AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", @@ -37,7 +38,9 @@ ENV_VARIABLES = [ FORCE_BASE64_FIELD = [ "OAUTH_GITHUB_CLIENT_ID", - "OAUTH_GITHUB_CLIENT_SECRET" + "OAUTH_GITHUB_CLIENT_SECRET", + "AWS_ACCESS_KEY_ID", + "AWS_SECRET_ACCESS_KEY", ] @@ -66,12 +69,15 @@ def setting_environment(environment: str): case "staging": DOMAIN="staging.hideyoshi.com.br" API_DOMAIN="api.staging.hideyoshi.com.br" + STORAGE_API_DOMAIN="storage.staging.hideyoshi.com.br" case _: DOMAIN="hideyoshi.com.br" API_DOMAIN="api.hideyoshi.com.br" + STORAGE_API_DOMAIN="storage.hideyoshi.com.br" os.environ["DOMAIN"] = DOMAIN os.environ["API_DOMAIN"] = API_DOMAIN + os.environ["STORAGE_API_DOMAIN"] = STORAGE_API_DOMAIN def load_secret_file(file: str): diff --git a/template/nginx-ingress/nginx-ingress-api.yaml b/template/nginx-ingress/nginx-ingress-api.yaml index 1c3d214..7c94e11 100644 --- a/template/nginx-ingress/nginx-ingress-api.yaml +++ b/template/nginx-ingress/nginx-ingress-api.yaml @@ -16,6 +16,13 @@ spec: - host: ${DOMAIN} http: paths: + - path: /api/storage + pathType: Prefix + backend: + service: + name: storage-service + port: + number: 8000 - path: /api(/|$)(.*) pathType: Prefix backend: @@ -25,6 +32,13 @@ spec: number: 8070 - http: paths: + - path: /api/storage + pathType: Prefix + backend: + service: + name: storage-service + port: + number: 8000 - path: /api(/|$)(.*) pathType: Prefix backend: diff --git a/template/nginx-ingress/nginx-ingress-root.yaml b/template/nginx-ingress/nginx-ingress-root.yaml index e752f56..243089e 100644 --- a/template/nginx-ingress/nginx-ingress-root.yaml +++ b/template/nginx-ingress/nginx-ingress-root.yaml @@ -12,6 +12,7 @@ spec: - hosts: - ${DOMAIN} - ${API_DOMAIN} + - ${STORAGE_API_DOMAIN} secretName: letsencrypt-cluster-certificate-tls rules: - host: ${DOMAIN} @@ -34,6 +35,16 @@ spec: name: backend-service port: number: 8070 + - host: ${STORAGE_API_DOMAIN} + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: storage-service + port: + number: 8000 - http: paths: - path: / diff --git a/template/storage/storage-secret.template.yaml b/template/storage/storage-secret.template.yaml index 4da3faf..0d3c07d 100644 --- a/template/storage/storage-secret.template.yaml +++ b/template/storage/storage-secret.template.yaml @@ -5,6 +5,7 @@ metadata: name: storage-secret type: Opaque data: + storage_url: $STORAGE_URL storage_type: $STORAGE_TYPE aws_access_key_id: $AWS_ACCESS_KEY_ID aws_access_access_key: $AWS_SECRET_ACCESS_KEY