Skip to content

Commit 71daedd

Browse files
jsell-rhclaude
andcommitted
fix(manifests): fix port name length and env patch conflict in deploy
Port name 'ambient-ui-proxy' (16 chars) exceeds Kubernetes 15-char limit, failing Service and Deployment validation. Rename to 'oauthproxy' across the oauth patch, service patch, and route. The frontend-github-callback-patch.yaml used JSON Patch op:add which appended GITHUB_CALLBACK_URL unconditionally — on re-apply against the live cluster this created a conflict where env[7] had both value and valueFrom set, which Kubernetes rejects. Move GITHUB_CALLBACK_URL into the base frontend-deployment.yaml so strategic merge patch deduplication handles it cleanly, and remove the patch file. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 4b1a0cf commit 71daedd

6 files changed

Lines changed: 12 additions & 27 deletions

File tree

components/manifests/base/core/frontend-deployment.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@ spec:
4444
name: unleash-credentials
4545
key: client-api-token
4646
optional: true
47+
- name: GITHUB_CALLBACK_URL
48+
valueFrom:
49+
configMapKeyRef:
50+
name: frontend-config
51+
key: github-callback-url
52+
optional: true
4753
resources:
4854
requests:
4955
cpu: 100m

components/manifests/overlays/production/ambient-ui-oauth-patch.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,18 @@ spec:
3939
- --skip-auth-regex=^/metrics
4040
ports:
4141
- containerPort: 8443
42-
name: ambient-ui-proxy
42+
name: oauthproxy
4343
livenessProbe:
4444
httpGet:
4545
path: /oauth/healthz
46-
port: ambient-ui-proxy
46+
port: oauthproxy
4747
scheme: HTTP
4848
initialDelaySeconds: 30
4949
periodSeconds: 5
5050
readinessProbe:
5151
httpGet:
5252
path: /oauth/healthz
53-
port: ambient-ui-proxy
53+
port: oauthproxy
5454
scheme: HTTP
5555
initialDelaySeconds: 5
5656
periodSeconds: 5

components/manifests/overlays/production/ambient-ui-route.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ spec:
1010
name: ambient-ui-service
1111
weight: 100
1212
port:
13-
targetPort: ambient-ui-proxy
13+
targetPort: oauthproxy
1414
tls:
1515
termination: edge
1616
insecureEdgeTerminationPolicy: Redirect

components/manifests/overlays/production/ambient-ui-service-patch.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ metadata:
77
spec:
88
ports:
99
- port: 8443
10-
targetPort: ambient-ui-proxy
10+
targetPort: oauthproxy
1111
protocol: TCP
12-
name: ambient-ui-proxy
12+
name: oauthproxy

components/manifests/overlays/production/frontend-github-callback-patch.yaml

Lines changed: 0 additions & 14 deletions
This file was deleted.

components/manifests/overlays/production/kustomization.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,6 @@ patches:
6868
kind: Service
6969
name: ambient-ui-service
7070
version: v1
71-
- path: frontend-github-callback-patch.yaml
72-
target:
73-
group: apps
74-
kind: Deployment
75-
name: frontend
76-
version: v1
77-
7871
# Production images
7972
images:
8073
- name: quay.io/ambient_code/vteam_api_server:latest

0 commit comments

Comments
 (0)