Merge feature/agent-platform into feature/cloudfront-on-agent-platform#781
Closed
allamand wants to merge 6 commits into
Closed
Merge feature/agent-platform into feature/cloudfront-on-agent-platform#781allamand wants to merge 6 commits into
allamand wants to merge 6 commits into
Conversation
Resolves: - ALAS2023-2026-1911 (Medium): libxml2 CVE-2026-6653 0:2.10.4-1.amzn2023.0.18 → 0:2.10.4-1.amzn2023.0.19 - ALAS2023-2026-1916: libblkid, libmount, libuuid 0:2.37.4-1.amzn2023.0.4 → 0:2.37.4-1.amzn2023.0.5 Release: v3.4.6 (fluent-bit v5.0.7, AL2023 base refresh)
…3.4.6 fix(observability): Bump aws-for-fluent-bit to 3.4.6
The backstage Ingress hardcoded ingressClassName: nginx with nginx-only
annotations, but the agent-platform clusters run the AWS Load Balancer
Controller (IngressClasses: alb, platform) with no nginx. The ALB
admission webhook rejected the ingress ('IngressClass nginx not found'),
so /backstage was unreachable.
Switch to ingressClassName: platform with the same ALB annotations used
by keycloak/langfuse (HTTPS:443, ssl-redirect, target-type ip). Backstage
already serves under baseUrl /backstage, so a Prefix path needs no rewrite.
…platform Resolved 3 real conflicts (verified branch-by-branch with explicit diff labels to avoid ambiguity): - gitops/addons/registry/observability.yaml: auto-merged cleanly. Kept exposure_mode (source) + upstream's newer Helm chart version bumps (kube-state-metrics 7.3.0, prometheus-node-exporter 4.55.0, opentelemetry-operator 0.112.1, cni-metrics-helper 1.21.1). Kept aws-for-fluentbit tag 3.4.6 (source's more recent pin) over upstream's 3.4.5. - gitops/overlays/environments/control-plane/enabled-addons.yaml: kept source (feature/cloudfront-on-agent-platform) entirely. Upstream (feature/agent-platform) had this file far behind — most addons still false (cert_manager, argo_events, argo_rollouts, kargo, kro_manifests_hub, multi_acct, platform_manifests*, kubevela, devlake, jupyterhub, ray_operator, spark_operator) — these are all required by this workshop and were already enabled on source. - gitops/addons/charts/backstage/templates/install.yaml: auto-merged cleanly except the final Ingress block. Kept source's dual-mode (insecure/ALB vs nginx/domain) ingress, matching the same established pattern already used in grafana and argo-workflows ingress templates (host: omitted in ALB/insecure mode since CloudFront routes by path on a single domain, not by host).
Contributor
Author
|
Closing: wrong approach — this created a merge of feature/agent-platform into my branch, not a conflict resolution on feature/cloudfront-on-agent-platform itself. Resolving the 2 conflicting files directly on the branch instead. |
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
4 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
Merges
feature/agent-platform(118 behind / 5 ahead offeature/cloudfront-on-agent-platformat merge-base time) into this branch, resolving the 3 real conflicts that GitHub flagged on PR #709.Conflicts resolved
gitops/addons/registry/observability.yamlexposure_mode(this branch) +feature/agent-platform's newer Helm chart version bumps (kube-state-metrics7.3.0,prometheus-node-exporter4.55.0,opentelemetry-operator0.112.1,cni-metrics-helper1.21.1). Kept this branch's more recentaws-for-fluentbittag (3.4.6) overfeature/agent-platform's 3.4.5.gitops/overlays/environments/control-plane/enabled-addons.yamlfeature/agent-platformhad this file far behind — most addons stillfalse(cert_manager,argo_events,argo_rollouts,kargo,kro_manifests_hub,multi_acct,platform_manifests*,kubevela,devlake,jupyterhub,ray_operator,spark_operator) — all required by this workshop and alreadytrueon this branch.gitops/addons/charts/backstage/templates/install.yamlIngressblock. Kept this branch's dual-mode (insecure/ALB vs nginx/domain) ingress, matching the same established pattern already used in thegrafanaandargo-workflowsingress templates (host:omitted in ALB/insecure mode since CloudFront routes by path on a single domain, not by host).Every other file from
feature/agent-platform's 118-commit lead over the merge-base merged automatically with no conflict.Verification
helm template gitops/addons/charts/backstagerenders cleanly in bothexposure_mode=cloudfront(ALB) and default (nginx/domain) modes.helm lintontemplates/install.yamlreports a YAML-parse false positive — confirmed pre-existing on this branch before this merge (reproduced on an isolated worktree offeature/cloudfront-on-agent-platformprior to merging). Not a regression introduced here;helm template(the actual rendering path ArgoCD uses) is unaffected.git grepclean).Not touched
hack/.zsh_historyis intentionally tracked (pre-seeds participant shell history for autocomplete) and was not modified by this merge.