chore: merge upstream m-cmp/main into develop - #88
Open
dogfootman wants to merge 35 commits into
Open
dogfootman wants to merge 35 commits into
dogfootman wants to merge 35 commits into
Conversation
Added environment variables for OPENBAO configuration and S3 region.
Removed timezone setting for the mc-cost-optimizer service.
Added timezone setting for containers in docker-compose.
BE now needs to call azure-vm-rightsizer, ncp-vm-rightsizer, and gcpCollector directly for on-demand batch triggers, but only costcollector/costprocessor/costselector URLs were wired. - add MC_COST_OPTIMIZER_AZURE_RIGHTSIZER_URL / NCP_RIGHTSIZER_URL - fix MC_COST_OPTIMIZER_COST_GCP_COLLECTOR_URL hostname (pointed at mc-cost-optimizer-cost-gcp-collector, a container that doesn't exist; the real service is mc-cost-optimizer-gcp-collector) - wire all three into mc-cost-optimizer-be's environment
latest currently resolves to 12.3.2 anyway (same digest, verified via docker pull), so this only removes the drift risk on future redeploys - no behavior change today.
…alarm URLs
- costopti.azurecollector.url / costopti.ncpcollector.url: BE needs
these to trigger Azure/NCP budget checks on demand, only
azurerightsizer/ncprightsizer/gcpcollector were wired.
- ALARM_SERVICE: costCollector's application.properties expects this
env var (costopti.alarmservice.url=${ALARM_SERVICE:alarm_service})
but it was never set here, so AWS budget alarms failed with
"URI is not absolute" trying to reach the literal string
"alarm_service" instead of a real URL.
Both env vars (MC_COST_OPTIMIZER_COST_AZURE_COLLECTOR_URL,
MC_COST_OPTIMIZER_COST_NCP_COLLECTOR_URL, MC_COST_OPTIMIZER_ALARM_URL)
already existed in .env.setup - just weren't wired into these services.
Update MC-Cost-Optimizer Docker images to version 0.6.3
Signed-off-by: Seokho Son <shsongist@gmail.com>
Use CB-TB v0.12.30
sync: installAll wave startup/monitoring, cleanAll image-keep option, nginx/iam fixes
Signed-off-by: Seokho Son <shsongist@gmail.com>
sync: mc-iam-manager/mc-web-console 0.6.2 bump, cli verbose-log fix
Signed-off-by: Seokho Son <shsongist@gmail.com>
fix: secure jenkins access and wait for plugin initialization
Use cb-tumblebug:0.13.2
chore: bump mc-observability to 0.6.1 and sync agent ansible files
feat: bootstrap Jenkins object storage credentials securely
This reverts commit bf06bfa.
fix: grant workflow submenu permissions
Resolve conf/docker/conf/mc-iam-manager/permission.yaml by keeping the develop side. Upstream m-cmp#199 added mcworkflows/mceventlistener to the old menu id list; develop already grants both, on top of a rework that aligns the permission seed with the redefined menu catalog. 17 of the ids only present upstream no longer exist in webconsole_menu_resources.yaml.
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
7 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.
목적
업스트림(m-cmp/main)을 develop에 먼저 머지해, 이후 develop → m-cmp/main 동기화 PR이 충돌 없이 올라가도록 합니다.
충돌 1건 해소
conf/docker/conf/mc-iam-manager/permission.yaml— develop 측 채택fix: grant workflow submenu permissions)가 구 메뉴 id 목록에mcworkflows,mceventlistener를 추가했는데, develop에는 두 항목이 이미 있습니다. #199의 의도는 보존됩니다.webconsole_menu_resources.yaml에 존재하지 않는 구 id(observability→mcobservability,images/specs→serverimages/serverspecs등 rename 및 폐기)라 제거가 정상입니다.검토 필요 — viewer 역할 권한 축소
업스트림에만 있던 id 19개 중
settings,environment2개는 현재 메뉴 카탈로그에 살아 있습니다. 이 둘이 빠지는 역할은viewer하나뿐입니다.operations,analytics,observability,settings,environment,cloudrescatalogsoperations,analytics,mcobservability,mco11ymonitorings,mc011ylogs,mc011yinsight,mc011ytracingadmin,operator는settings/environment를 그대로 유지합니다. viewer에서 뺀 것이 의도된 축소인지 확인 부탁드립니다. 의도와 다르면 이 PR에서 두 줄 추가하면 됩니다.이미지 태그 병합 결과
업스트림이 앞서 있던 태그가 모두 반영되고, develop이 앞서 있던 태그는 유지됩니다.
검증
docker compose --env-file .env.setup config통과permission.yamlYAML 파싱 정상 (역할 5개: admin, billadmin, billviewer, operator, viewer)upstream/main이 이 브랜치에 완전 포함됨 확인