diff --git a/apps/control-interface/ugok/patch.yaml b/apps/control-interface/ugok/patch.yaml index 1dc366a..08fd5ba 100644 --- a/apps/control-interface/ugok/patch.yaml +++ b/apps/control-interface/ugok/patch.yaml @@ -10,4 +10,4 @@ spec: frontend: image: name: - _default: cr.yandex/crp3ccidau046kdj8g9q/srx-admin:prod_feb59026 + _default: 10.4.10.187:80/library/srx-admin:prod_638c3442 diff --git a/apps/django/ugok/backend.yaml b/apps/django/ugok/backend.yaml index 1ff38cf..5c795b3 100644 --- a/apps/django/ugok/backend.yaml +++ b/apps/django/ugok/backend.yaml @@ -250,7 +250,7 @@ spec: _default: "True" - name: RESOURCES_INTERNAL_HOST value: - _default: http://resources-service.resources.svc.cluster.local:8000 + _default: http://iams.iam.svc.cluster.local:8080 - name: KAFKA_TOPICS value: _default: '{"planning": "message-hub-stage", "ams-sync": "ams-sync"}' diff --git a/apps/django/ugok/celery.yaml b/apps/django/ugok/celery.yaml index b96d9d1..1b6e5cc 100644 --- a/apps/django/ugok/celery.yaml +++ b/apps/django/ugok/celery.yaml @@ -235,7 +235,7 @@ spec: _default: "True" - name: RESOURCES_INTERNAL_HOST value: - _default: http://resources-service.resources.svc.cluster.local:8000 + _default: http://iams.iam.svc.cluster.local:8080 - name: KAFKA_TOPICS value: _default: '{"planning": "message-hub-stage", "ams-sync": "ams-sync"}' diff --git a/apps/documentations/ugok/pdm.yaml b/apps/documentations/ugok/pdm.yaml index fcbc0f0..d2d6820 100644 --- a/apps/documentations/ugok/pdm.yaml +++ b/apps/documentations/ugok/pdm.yaml @@ -204,7 +204,7 @@ spec: _default: http://remarks-static.remarks.svc.cluster.local:80/remarks - name: RESOURCES_URL value: - _default: http://resources-service.resources.svc.cluster.local:8000 + _default: http://iams.iam.svc.cluster.local:8080 - name: S3_SERVICE_ACCOUNT value: _default: /etc/sarex/yc-s3-storage/yc-s3-service-account.json diff --git a/apps/flows/ugok/backend.yaml b/apps/flows/ugok/backend.yaml index 6f72a78..e95b808 100644 --- a/apps/flows/ugok/backend.yaml +++ b/apps/flows/ugok/backend.yaml @@ -160,7 +160,7 @@ spec: _default: "5672" - name: RESOURCE_URL value: - _default: http://resources-service.resources.svc.cluster.local:8000 + _default: http://iams.iam.svc.cluster.local:8080 - name: SERVICE_HOST value: _default: https://sarex.ugok.lan/flows/api/v1 diff --git a/apps/flows/ugok/celery.yaml b/apps/flows/ugok/celery.yaml index ad454e3..9e05a6d 100644 --- a/apps/flows/ugok/celery.yaml +++ b/apps/flows/ugok/celery.yaml @@ -149,7 +149,7 @@ spec: _default: "5672" - name: RESOURCE_URL value: - _default: http://resources-service.resources.svc.cluster.local:8000 + _default: http://iams.iam.svc.cluster.local:8080 - name: SERVICE_HOST value: _default: https://sarex.ugok.lan/flows/api/v1 @@ -182,7 +182,7 @@ spec: _default: http://backend-service.flows.svc.cluster.local:8000 - name: RESOURCES_HOST value: - _default: http://resources-service.resources.svc.cluster.local:8000/ + _default: http://iams.iam.svc.cluster.local:8080/ - name: DJANGO_BASE_HOST value: _default: https://ugok-sarex.uralmine.com diff --git a/apps/issues/ugok/backend.yaml b/apps/issues/ugok/backend.yaml index eb67964..9b01aa8 100644 --- a/apps/issues/ugok/backend.yaml +++ b/apps/issues/ugok/backend.yaml @@ -142,7 +142,7 @@ spec: _default: http://workflows-api-service.workflow.svc.cluster.local:8000 - name: RESOURCES_API_HOST value: - _default: http://resources-service.resources.svc.cluster.local:8000 + _default: http://iams.iam.svc.cluster.local:8080 - name: EAV_HOST value: _default: http://eav-service.eav.svc.cluster.local:8000 diff --git a/apps/issues/ugok/celery.yaml b/apps/issues/ugok/celery.yaml index 80bf1c7..793a15d 100644 --- a/apps/issues/ugok/celery.yaml +++ b/apps/issues/ugok/celery.yaml @@ -128,7 +128,7 @@ spec: _default: http://workflows-api-service.workflow.svc.cluster.local:8000 - name: RESOURCES_API_HOST value: - _default: http://resources-service.resources.svc.cluster.local:8000 + _default: http://iams.iam.svc.cluster.local:8080 - name: EAV_HOST value: _default: http://eav-service.eav.svc.cluster.local:8000 diff --git a/apps/issues/ugok/production-configmap.yaml b/apps/issues/ugok/production-configmap.yaml index 3ff04d9..f1210fd 100644 --- a/apps/issues/ugok/production-configmap.yaml +++ b/apps/issues/ugok/production-configmap.yaml @@ -11,4 +11,4 @@ metadata: name: production-configmap namespace: issues data: - production.py: "from datetime import timedelta\nimport os\nfrom .base import *\n\n# DEBUG SETTINGS START\n# -----------------------------------------------------------------------------\nDEBUG = True\n# -----------------------------------------------------------------------------\n\nTEST_MODE = False\n\n# SECRETS SETTINGS START\n# -----------------------------------------------------------------------------\n\nAWS_S3_VERIFY=False\nENABLE_MAILGUN=False\nSECRET_KEY = \"FromToMuchLoveOfLiving\" # Delete after Test\n# -----------------------------------------------------------------------------\n\n# ALLOWED HOSTS START\n# -----------------------------------------------------------------------------\nALLOWED_HOSTS = [\"*\"]\n# -----------------------------------------------------------------------------\n\n# APPS SETTINGS START\n# -----------------------------------------------------------------------------\n# INSTALLED_APPS += [\n# \"django_extensions\",\n# ]\n# -----------------------------------------------------------------------------\n\nDJANGO_TOKEN=\"aGFnZW4wMTM6emVhbG90MDk2\"\n\n# DEBUG SETTINGS START\n# -----------------------------------------------------------------------------\nDEBUG = True\n# -----------------------------------------------------------------------------\n\nREVIEW_HOST='http://backend-service.flows.svc.cluster.local:8000'\n# -----------------------------------------------------------------------------\n# EXTERNAL SERVICES END\n\nWORKFLOWS_HOST = \"http://workflows-api-service.workflow.svc.cluster.local:8000\"\nWORKFLOWS_URL = \"http://workflows-api-service.workflow.svc.cluster.local:8000\"\nDOCUMENTATIONS_URL = \"http://documentations-api.documentations.svc.cluster.local:8080\"\nRESOURCES_API_HOST = os.getenv(\"RESOURCES_API_HOST\", default=\"http://resources-service.resources.svc.cluster:8000\")\nKAFKA_HOST = \"ugok-prod-kafka-bootstrap.kafka.svc.cluster.local:9093\" \nKAFKA_USERNAME = \"sarex\" \nKAFKA_PASSWORD = \"nK36sasvSfoItJnXQ4qxav2OUWIPX5ZC\"\nKAFKA_SSL_CAFILE = os.getenv(\"KAFKA_SSL_CAFILE\", \"/usr/local/share/ca-certificates/kafka.crt\")\nKAFKA_EAV_ASSETS_TOPIC = os.getenv(\"KAFKA_EAV_ASSETS_TOPIC\", \"sarex\")\nKAFKA_ISSUES_TOPIC = os.getenv(\"KAFKA_ISSUES_TOPIC\", \"sarex-issues\")\nSMTP_HOST = 'mail.uchgok.ru'\nSMTP_PORT = 25\nEMAIL_FROM = 'sarex@uchgok.ru'\n\n\nUSE_ASYNC_FUNCTIONS = False\nUSE_NOTIFICATIONS = True\n\n# JWT SETTINGS START\n# ---------------------------------------------------------------------------------------------------------------------\nSIMPLE_JWT_ISSUER = os.getenv(\"SIMPLE_JWT_ISSUER\", default=\"default_issuer\")\n\nSIMPLE_JWT = {\n \"ACCESS_TOKEN_LIFETIME\": timedelta(minutes=5),\n \"REFRESH_TOKEN_LIFETIME\": timedelta(days=1),\n \"ROTATE_REFRESH_TOKENS\": False,\n \"UPDATE_LAST_LOGIN\": False,\n\n \"ALGORITHM\": \"RS512\",\n \"SIGNING_KEY\": os.getenv(\"JWT_PRIVATE_KEY\", default=\"\").replace(\"\\\\n\", \"\\n\"),\n \"VERIFYING_KEY\": os.getenv(\"JWT_PUBLIC_KEY\").replace(\"\\\\n\", \"\\n\"),\n \"AUDIENCE\": None,\n \"ISSUER\": SIMPLE_JWT_ISSUER,\n\n \"AUTH_HEADER_TYPES\": (\"Bearer\",),\n \"AUTH_HEADER_NAME\": \"HTTP_AUTHORIZATION\",\n \"USER_ID_FIELD\": \"id\",\n \"USER_ID_CLAIM\": \"user_id\",\n\n \"AUTH_TOKEN_CLASSES\": (\"rest_framework_simplejwt.tokens.AccessToken\",),\n \"TOKEN_TYPE_CLAIM\": \"token_type\",\n\n \"JTI_CLAIM\": \"jti\",\n\n \"SLIDING_TOKEN_REFRESH_EXP_CLAIM\": \"refresh_exp\",\n \"SLIDING_TOKEN_LIFETIME\": timedelta(minutes=5),\n \"SLIDING_TOKEN_REFRESH_LIFETIME\": timedelta(days=1),\n}\n# ---------------------------------------------------------------------------------------------------------------------\n\nCORS_ALLOWED_ORIGINS = [\n \"https://ugok-sarex.uralmine.com\",\n]\n\nCORS_TRUSTED_ORIGINS = [\n \"https://ugok-sarex.uralmine.com\",\n]\n\nCSRF_TRUSTED_ORIGINS = [\n \"https://ugok-sarex.uralmine.com\",\n]\n\nCORS_ALLOW_ALL_ORIGINS = True\n\nCORS_ALLOW_METHODS = [\n \"DELETE\",\n \"GET\",\n \"OPTIONS\",\n \"PATCH\",\n \"POST\",\n \"PUT\",\n]\n\nSAREX_API = \"http://backend.django.svc.cluster.local:8000\"\n\nAERO_PUBLIC_HOST = os.getenv(\"AERO_PUBLIC_HOST\", default=SAREX_API)\n\nBASE_AERO_URL = \"http://backend.django.svc.cluster.local:8000\"\n\nENVIRONMENT = \"production\"\n\nSESSION_COOKIE_NAME = \"issues-sessionid\"\nCSRF_COOKIE_NAME = \"issues-csrftoken\"\nSTATIC_URL = \"/static/\"\nSTORAGES = {\n 'default': {\n 'BACKEND': \"storages.backends.s3boto3.S3Boto3Storage\",\n },\n 'staticfiles': {\n # Leave whatever setting you already have here, e.g.:\n 'BACKEND': \"storages.backends.s3boto3.S3Boto3Storage\",\n }\n}\n" + production.py: "from datetime import timedelta\nimport os\nfrom .base import *\n\n# DEBUG SETTINGS START\n# -----------------------------------------------------------------------------\nDEBUG = True\n# -----------------------------------------------------------------------------\n\nTEST_MODE = False\n\n# SECRETS SETTINGS START\n# -----------------------------------------------------------------------------\n\nAWS_S3_VERIFY=False\nENABLE_MAILGUN=False\nSECRET_KEY = \"FromToMuchLoveOfLiving\" # Delete after Test\n# -----------------------------------------------------------------------------\n\n# ALLOWED HOSTS START\n# -----------------------------------------------------------------------------\nALLOWED_HOSTS = [\"*\"]\n# -----------------------------------------------------------------------------\n\n# APPS SETTINGS START\n# -----------------------------------------------------------------------------\n# INSTALLED_APPS += [\n# \"django_extensions\",\n# ]\n# -----------------------------------------------------------------------------\n\nDJANGO_TOKEN=\"aGFnZW4wMTM6emVhbG90MDk2\"\n\n# DEBUG SETTINGS START\n# -----------------------------------------------------------------------------\nDEBUG = True\n# -----------------------------------------------------------------------------\n\nREVIEW_HOST='http://backend-service.flows.svc.cluster.local:8000'\n# -----------------------------------------------------------------------------\n# EXTERNAL SERVICES END\n\nWORKFLOWS_HOST = \"http://workflows-api-service.workflow.svc.cluster.local:8000\"\nWORKFLOWS_URL = \"http://workflows-api-service.workflow.svc.cluster.local:8000\"\nDOCUMENTATIONS_URL = \"http://documentations-api.documentations.svc.cluster.local:8080\"\nRESOURCES_API_HOST = os.getenv(\"RESOURCES_API_HOST\", default=\"http://iams.iam.svc.cluster.local:8080\")\nKAFKA_HOST = \"ugok-prod-kafka-bootstrap.kafka.svc.cluster.local:9093\" \nKAFKA_USERNAME = \"sarex\" \nKAFKA_PASSWORD = \"nK36sasvSfoItJnXQ4qxav2OUWIPX5ZC\"\nKAFKA_SSL_CAFILE = os.getenv(\"KAFKA_SSL_CAFILE\", \"/usr/local/share/ca-certificates/kafka.crt\")\nKAFKA_EAV_ASSETS_TOPIC = os.getenv(\"KAFKA_EAV_ASSETS_TOPIC\", \"sarex\")\nKAFKA_ISSUES_TOPIC = os.getenv(\"KAFKA_ISSUES_TOPIC\", \"sarex-issues\")\nSMTP_HOST = 'mail.uchgok.ru'\nSMTP_PORT = 25\nEMAIL_FROM = 'sarex@uchgok.ru'\n\n\nUSE_ASYNC_FUNCTIONS = False\nUSE_NOTIFICATIONS = True\n\n# JWT SETTINGS START\n# ---------------------------------------------------------------------------------------------------------------------\nSIMPLE_JWT_ISSUER = os.getenv(\"SIMPLE_JWT_ISSUER\", default=\"default_issuer\")\n\nSIMPLE_JWT = {\n \"ACCESS_TOKEN_LIFETIME\": timedelta(minutes=5),\n \"REFRESH_TOKEN_LIFETIME\": timedelta(days=1),\n \"ROTATE_REFRESH_TOKENS\": False,\n \"UPDATE_LAST_LOGIN\": False,\n\n \"ALGORITHM\": \"RS512\",\n \"SIGNING_KEY\": os.getenv(\"JWT_PRIVATE_KEY\", default=\"\").replace(\"\\\\n\", \"\\n\"),\n \"VERIFYING_KEY\": os.getenv(\"JWT_PUBLIC_KEY\").replace(\"\\\\n\", \"\\n\"),\n \"AUDIENCE\": None,\n \"ISSUER\": SIMPLE_JWT_ISSUER,\n\n \"AUTH_HEADER_TYPES\": (\"Bearer\",),\n \"AUTH_HEADER_NAME\": \"HTTP_AUTHORIZATION\",\n \"USER_ID_FIELD\": \"id\",\n \"USER_ID_CLAIM\": \"user_id\",\n\n \"AUTH_TOKEN_CLASSES\": (\"rest_framework_simplejwt.tokens.AccessToken\",),\n \"TOKEN_TYPE_CLAIM\": \"token_type\",\n\n \"JTI_CLAIM\": \"jti\",\n\n \"SLIDING_TOKEN_REFRESH_EXP_CLAIM\": \"refresh_exp\",\n \"SLIDING_TOKEN_LIFETIME\": timedelta(minutes=5),\n \"SLIDING_TOKEN_REFRESH_LIFETIME\": timedelta(days=1),\n}\n# ---------------------------------------------------------------------------------------------------------------------\n\nCORS_ALLOWED_ORIGINS = [\n \"https://ugok-sarex.uralmine.com\",\n]\n\nCORS_TRUSTED_ORIGINS = [\n \"https://ugok-sarex.uralmine.com\",\n]\n\nCSRF_TRUSTED_ORIGINS = [\n \"https://ugok-sarex.uralmine.com\",\n]\n\nCORS_ALLOW_ALL_ORIGINS = True\n\nCORS_ALLOW_METHODS = [\n \"DELETE\",\n \"GET\",\n \"OPTIONS\",\n \"PATCH\",\n \"POST\",\n \"PUT\",\n]\n\nSAREX_API = \"http://backend.django.svc.cluster.local:8000\"\n\nAERO_PUBLIC_HOST = os.getenv(\"AERO_PUBLIC_HOST\", default=SAREX_API)\n\nBASE_AERO_URL = \"http://backend.django.svc.cluster.local:8000\"\n\nENVIRONMENT = \"production\"\n\nSESSION_COOKIE_NAME = \"issues-sessionid\"\nCSRF_COOKIE_NAME = \"issues-csrftoken\"\nSTATIC_URL = \"/static/\"\nSTORAGES = {\n 'default': {\n 'BACKEND': \"storages.backends.s3boto3.S3Boto3Storage\",\n },\n 'staticfiles': {\n # Leave whatever setting you already have here, e.g.:\n 'BACKEND': \"storages.backends.s3boto3.S3Boto3Storage\",\n }\n}\n" diff --git a/apps/pm/ugok/backend.yaml b/apps/pm/ugok/backend.yaml index fb84f35..d77c450 100644 --- a/apps/pm/ugok/backend.yaml +++ b/apps/pm/ugok/backend.yaml @@ -136,7 +136,7 @@ spec: _default: http://backend.django.svc.cluster.local:8000 - name: RESOURCES_INTERNAL_HOST value: - _default: http://resources-service.resources.svc.cluster.local:8000 + _default: http://iams.iam.svc.cluster.local:8080 - name: EAV_HOST value: _default: http://eav-service.eav.svc.cluster.local:8000 diff --git a/apps/pm/ugok/celery.yaml b/apps/pm/ugok/celery.yaml index 6b69ade..3ca5964 100644 --- a/apps/pm/ugok/celery.yaml +++ b/apps/pm/ugok/celery.yaml @@ -120,7 +120,7 @@ spec: _default: http://backend.django.svc.cluster.local:8000 - name: RESOURCES_INTERNAL_HOST value: - _default: http://resources-service.resources.svc.cluster.local:8000 + _default: http://iams.iam.svc.cluster.local:8080 - name: EAV_HOST value: _default: http://eav-service.eav.svc.cluster.local:8000 diff --git a/apps/processing/ugok/engine-low.yaml b/apps/processing/ugok/engine-low.yaml index 764b66e..3eca846 100644 --- a/apps/processing/ugok/engine-low.yaml +++ b/apps/processing/ugok/engine-low.yaml @@ -168,7 +168,7 @@ spec: _default: http://documentations-filestream.documentations.svc.cluster.local:8080 - name: RESOURCES_API_INTERNAL_HOST value: - _default: http://resources-service.resources.svc.cluster.local:8000 + _default: http://iams.iam.svc.cluster.local:8080 - name: ENABLE_SQL_QUERY value: _default: "0" diff --git a/apps/processing/ugok/engine.yaml b/apps/processing/ugok/engine.yaml index 749eac7..25e1fa8 100644 --- a/apps/processing/ugok/engine.yaml +++ b/apps/processing/ugok/engine.yaml @@ -168,7 +168,7 @@ spec: _default: http://documentations-filestream.documentations.svc.cluster.local:8080 - name: RESOURCES_API_INTERNAL_HOST value: - _default: http://resources-service.resources.svc.cluster.local:8000 + _default: http://iams.iam.svc.cluster.local:8080 - name: ENABLE_SQL_QUERY value: _default: "0" diff --git a/apps/transmittal/ugok/backend.yaml b/apps/transmittal/ugok/backend.yaml index 257d8c7..f431b75 100644 --- a/apps/transmittal/ugok/backend.yaml +++ b/apps/transmittal/ugok/backend.yaml @@ -193,7 +193,7 @@ spec: _default: "15" - name: TRANSMITTAL_SERVICE_RESOURCE_REPOSITORY__BASE_URL value: - _default: http://resources-service.resources.svc.cluster.local:8000 + _default: http://iams.iam.svc.cluster.local:8080 - name: TRANSMITTAL_SERVICE_RESOURCE_REPOSITORY__MAX_CONNECTIONS value: _default: "10" diff --git a/apps/transmittal/ugok/worker.yaml b/apps/transmittal/ugok/worker.yaml index eb156f2..5775b31 100644 --- a/apps/transmittal/ugok/worker.yaml +++ b/apps/transmittal/ugok/worker.yaml @@ -182,7 +182,7 @@ spec: _default: "15" - name: TRANSMITTAL_SERVICE_RESOURCE_REPOSITORY__BASE_URL value: - _default: http://resources-service.resources.svc.cluster.local:8000 + _default: http://iams.iam.svc.cluster.local:8080 - name: TRANSMITTAL_SERVICE_RESOURCE_REPOSITORY__MAX_CONNECTIONS value: _default: "10"