fix/feat: nginx port fix, FE service config, and env/deploy sync from mc-admin-cli#82
Merged
Conversation
- .env.setup: replace hardcoded mciam.onecloudcon.com with mciam.local placeholder; add MC_IAM_MANAGER_PUBLIC_DOMAIN/HOST/KEYCLOAK_HOST for schema parity with mc-admin-cli; add MC_INFRA_MANAGER_API_USERNAME/ PASSWORD and MC_INFRA_CONNECTOR_API_USERNAME/PASSWORD; add MC_IAM_MANAGER_DOMAIN "do not change" comment - conf/mc-iam-manager/0_preset_dev.sh: remove sudo chown -R on container-volume; use targeted mkdir+writable-check for certs/ and nginx/ only to avoid failures on Docker root-owned subdirs - docker-compose.yaml: convert mc-iam-manager.depends_on to long form, add mc-infra-manager:service_healthy and elevate db/kc to service_healthy to prevent DNS-resolve failure on cold start - conf/mc-iam-manager/docker-post-init.sh: add file (was absent from main); includes RECOVERY guide block on 1_setup_auto.sh failure - readme.md / readme_kr.md: add Troubleshooting section for unhealthy post-init and directory permission errors
하드코딩된 포트 80을 환경변수 MC_COST_OPTIMIZER_FE_PORT로 대체하고 .env.setup 기본값을 7780으로 설정. 0_preset_dev/prod.sh에 변수 읽기 및 sed 치환 로직 추가.
…ework entries - Add mc-application-manager-fe, mc-workflow-manager-fe, mc-data-manager-fe, mc-cost-optimizer-fe to conf/mc-iam-manager/api.yaml and asset/mcmpapi/mcmp_api.yaml - Activate previously commented-out frameworks in frameworks.yaml (mc-observability, mc-infra-manager, mc-infra-connector, mc-data-manager, mc-across-service-manager, mc-web-console); swagger lines remain commented where spec path is unverified or unavailable - Regenerate src/docs swagger (docs.go, swagger.json, swagger.yaml) from src/
feat(conf): add FE services to api/mcmp_api configs and activate framework entries
Resolve 4-file conflict against develop a200506/84ab35e5/59fadca0/4b791298: - .env.setup: keep develop (PR intent already absorbed by a200506); add MC_IAM_MANAGER_DOMAIN immutability comment - conf/mc-iam-manager/0_preset_dev.sh: keep develop body, swap chown -R block for targeted mkdir+writable check (avoids root-owned subdir issue) - conf/mc-iam-manager/docker-post-init.sh: keep develop body, replace 1_setup_auto.sh failure branch with RECOVERY guide - docker-compose.yaml: auto-merged (long-form depends_on with db/kc/ infra-manager service_healthy + develop wget readyz healthcheck)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
MC_COST_OPTIMIZER_FE_PORTenv var (default: 7780);0_preset_dev/prod.shupdated to inject the variable via sedapi.yamlandmcmp_api.yaml; activate previously commented-out frameworks (mc-observability, mc-infra-manager, mc-infra-connector, mc-data-manager, mc-across-service-manager, mc-web-console) inframeworks.yaml; regenerate Swagger docsdocker-compose.yaml: convertmc-iam-manager.depends_onto long form withservice_healthyfor db/kc/infra-manager to prevent DNS-resolve failures on cold startconf/mc-iam-manager/docker-post-init.sh: add missing file with recovery guide for1_setup_auto.shfailures0_preset_dev.sh: removesudo chown -Ron container-volume; use targeted mkdir+writable-checkreadme.md/readme_kr.md: add Troubleshooting section for unhealthy post-init and directory permission errors