diff --git a/dev/bootstrap-kustomization.yaml b/dev/bootstrap-kustomization.yaml index b5d417e..6f177e2 100644 --- a/dev/bootstrap-kustomization.yaml +++ b/dev/bootstrap-kustomization.yaml @@ -22,12 +22,12 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: - name: catalogue-agent-bootstrap + name: catalog-agent-bootstrap namespace: agents spec: interval: 10m sourceRef: kind: GitRepository - name: catalogue-agent + name: catalog-agent path: ./dev prune: true diff --git a/dev/flux-kustomization.yaml b/dev/flux-kustomization.yaml index 6dabde4..dcc824a 100644 --- a/dev/flux-kustomization.yaml +++ b/dev/flux-kustomization.yaml @@ -1,13 +1,13 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: - name: catalogue-agent + name: catalog-agent namespace: agents spec: interval: 10m sourceRef: kind: GitRepository - name: catalogue-agent + name: catalog-agent path: ./k8s prune: true wait: true diff --git a/dev/gitrepository.yaml b/dev/gitrepository.yaml index 92d89f2..2cb0aef 100644 --- a/dev/gitrepository.yaml +++ b/dev/gitrepository.yaml @@ -9,7 +9,7 @@ apiVersion: source.toolkit.fluxcd.io/v1 kind: GitRepository metadata: - name: catalogue-agent + name: catalog-agent namespace: agents spec: interval: 5m diff --git a/k8s/configmap.yaml b/k8s/configmap.yaml index 75a6159..6fc4ec6 100644 --- a/k8s/configmap.yaml +++ b/k8s/configmap.yaml @@ -1,10 +1,10 @@ # Everything here is an endpoint or a public identifier. The one secret the -# agent holds arrives through catalogue-agent-secrets; nothing in this file is +# agent holds arrives through catalog-agent-secrets; nothing in this file is # sensitive, which is the point of keeping the split visible. apiVersion: v1 kind: ConfigMap metadata: - name: catalogue-agent-config + name: catalog-agent-config namespace: agents data: CATALOGUE_KEYCLOAK_REALM_URL: https://keycloak.sttlab.local/realms/classic-models @@ -23,4 +23,7 @@ data: # What other agents dial, so it is the Service DNS name and not the bind # address. It is advertised in the Agent Card; get it wrong and A2A callers # are pointed at nothing. - CATALOGUE_PUBLIC_URL: http://catalogue-agent.agents.svc.cluster.local:8080/ + CATALOGUE_PUBLIC_URL: http://catalog-agent.agents.svc.cluster.local:8080/ + # The peer's Service name, overriding the default in config.py — set here so + # the rename took effect without rebuilding an image. + CATALOGUE_APPROVISIONNEMENT_URL: http://supply-agent.agents.svc.cluster.local:8080/ diff --git a/k8s/deployment.yaml b/k8s/deployment.yaml index c2ba892..5db6c74 100644 --- a/k8s/deployment.yaml +++ b/k8s/deployment.yaml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: catalogue-agent + name: catalog-agent namespace: agents spec: # One replica, and that is a constraint rather than a default. Conversation @@ -12,11 +12,11 @@ spec: replicas: 1 selector: matchLabels: - app: catalogue-agent + app: catalog-agent template: metadata: labels: - app: catalogue-agent + app: catalog-agent spec: securityContext: runAsNonRoot: true @@ -36,9 +36,9 @@ spec: containerPort: 8080 envFrom: - configMapRef: - name: catalogue-agent-config + name: catalog-agent-config - secretRef: - name: catalogue-agent-secrets + name: catalog-agent-secrets volumeMounts: - name: sttlab-ca mountPath: /etc/sttlab-ca diff --git a/k8s/externalsecret.yaml b/k8s/externalsecret.yaml index 075ee4b..330bd7c 100644 --- a/k8s/externalsecret.yaml +++ b/k8s/externalsecret.yaml @@ -8,7 +8,7 @@ apiVersion: external-secrets.io/v1 kind: ExternalSecret metadata: - name: catalogue-agent-secrets + name: catalog-agent-secrets namespace: agents spec: refreshInterval: 1h @@ -16,7 +16,7 @@ spec: kind: ClusterSecretStore name: vault-keycloak target: - name: catalogue-agent-secrets + name: catalog-agent-secrets data: - secretKey: CATALOGUE_CLIENT_SECRET remoteRef: diff --git a/k8s/ingress.yaml b/k8s/ingress.yaml index 432c505..16a74b5 100644 --- a/k8s/ingress.yaml +++ b/k8s/ingress.yaml @@ -4,7 +4,7 @@ # every conversation with it went through `kubectl run curl`. An orchestrator # nobody can talk to is not finished. # -# Peer traffic does **not** come through here — catalogue calls, and is called by, +# Peer traffic does **not** come through here — this agent calls, and is called by, # other agents on their in-cluster Service names. This is the human door. # # ## It is not an open door @@ -27,10 +27,10 @@ apiVersion: cert-manager.io/v1 kind: Certificate metadata: - name: catalogue-agent-tls + name: catalog-agent-tls namespace: agents spec: - secretName: catalogue-agent-tls + secretName: catalog-agent-tls dnsNames: - catalog-agent.sttlab.local issuerRef: @@ -40,7 +40,7 @@ spec: apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: catalogue-agent + name: catalog-agent namespace: agents annotations: nginx.ingress.kubernetes.io/auth-url: http://keycloak.keycloak.svc.cluster.local:8080/realms/classic-models/protocol/openid-connect/userinfo @@ -56,7 +56,7 @@ spec: tls: - hosts: - catalog-agent.sttlab.local - secretName: catalogue-agent-tls + secretName: catalog-agent-tls rules: - host: catalog-agent.sttlab.local http: @@ -65,6 +65,6 @@ spec: pathType: Prefix backend: service: - name: catalogue-agent + name: catalog-agent port: number: 8080 diff --git a/k8s/service.yaml b/k8s/service.yaml index 87db003..f18facb 100644 --- a/k8s/service.yaml +++ b/k8s/service.yaml @@ -1,11 +1,11 @@ apiVersion: v1 kind: Service metadata: - name: catalogue-agent + name: catalog-agent namespace: agents spec: selector: - app: catalogue-agent + app: catalog-agent ports: - name: http port: 8080 diff --git a/src/catalogue_agent/config.py b/src/catalogue_agent/config.py index 9b6ee28..f7020af 100644 --- a/src/catalogue_agent/config.py +++ b/src/catalogue_agent/config.py @@ -39,7 +39,7 @@ class Settings(BaseSettings): # An A2A call returns an answer, not data. Consulting this one is how the # agent learns whether a reference is about to be reordered before it # recommends dropping it — without gaining any sight of the supply domain. - approvisionnement_url: str = "http://approvisionnement-agent.agents.svc.cluster.local:8080/" + approvisionnement_url: str = "http://supply-agent.agents.svc.cluster.local:8080/" approvisionnement_scope: str = "classic-models-agent-approvisionnement-audience" mcp_sales_scope: str = "mcp-sales-audience token-exchange-broker-audience"