Agent Mesh
Go a2aa2a-protocolagent-meshagentic-aiinferencemcpmeshmesh-networknetwork-securitynetworking-aip2p-network
fix
Antonio Ojea75b075e395d2
diff --git a/charts/sam-mesh/templates/dex-deployment.yaml b/charts/sam-mesh/templates/dex-deployment.yamlindex 1b0db0ed..f4a0a614 100644--- a/charts/sam-mesh/templates/dex-deployment.yaml+++ b/charts/sam-mesh/templates/dex-deployment.yaml@@ -7,7 +7,7 @@ metadata:{{- include "sam-mesh.labels" . | nindent 4 }}data:config.yaml: |- issuer: http://dex:5556/dex+ issuer: http://{{ include "sam-mesh.fullname" . }}-dex:5556/dexstorage:type: memoryweb:@@ -69,7 +69,7 @@ spec:apiVersion: v1kind: Servicemetadata:- name: dex+ name: {{ include "sam-mesh.fullname" . }}-dexlabels:{{- include "sam-mesh.labels" . | nindent 4 }}spec:diff --git a/charts/sam-mesh/values.yaml b/charts/sam-mesh/values.yamlindex ce0e6cf6..2a2baead 100644--- a/charts/sam-mesh/values.yaml+++ b/charts/sam-mesh/values.yaml@@ -10,7 +10,7 @@ controlPlane:adminToken: super-secret-admin-tokenautoApproveEnrollment: trueinsecureSkipTlsVerify: true- oidcIssuer: "http://dex:5556/dex"+ oidcIssuer: "http://sam-mesh-dex:5556/dex"allowedAudiences: "sam-mesh-audience,sam-hub-audience"service:type: ClusterIPdiff --git a/internal/controlplane/server.go b/internal/controlplane/server.goindex 9cbcf205..a7b0f935 100644--- a/internal/controlplane/server.go+++ b/internal/controlplane/server.go@@ -63,7 +63,9 @@ type Server struct {httpServer *http.Serverlistener net.Listenerlimiter *rate.Limiter- mesh MeshAdapter++ meshMu sync.RWMutex+ mesh MeshAdapterprovidersMu sync.RWMutexproviders map[string]*oidc.Provider@@ -97,10 +99,18 @@ func NewServer(config Options, store storage.Store) (*Server, error) {// SetMeshAdapter sets a custom MeshAdapter implementation for the control plane.func (s *Server) SetMeshAdapter(m MeshAdapter) {if m != nil {+ s.meshMu.Lock()s.mesh = m+ s.meshMu.Unlock()}}+func (s *Server) getMeshAdapter() MeshAdapter {+ s.meshMu.RLock()+ defer s.meshMu.RUnlock()+ return s.mesh+}+// Start boots up HTTP services, sets up OIDC providers, loads initial keys and policies, and schedules rotations.func (s *Server) Start() error {// Initialize Keyring@@ -231,7 +241,7 @@ func (s *Server) runKeyRotationLoop() {logger.Errorf("Failed to rotate keyring: %v", err)} else {logger.Infof("Key rotation committed. New current public key: %s", hex.EncodeToString(newPub))- if err := s.mesh.PublishEvent(s.ctx, api.MeshEvent_KEY_ROTATION, "", newPub); err != nil {+ if err := s.getMeshAdapter().PublishEvent(s.ctx, api.MeshEvent_KEY_ROTATION, "", newPub); err != nil {logger.Warnf("Failed to publish KEY_ROTATION event to mesh: %v", err)}}@@ -872,7 +882,7 @@ func (s *Server) HandlePolicies(w http.ResponseWriter, r *http.Request) {return}- if err := s.mesh.PublishEvent(r.Context(), api.MeshEvent_POLICY_UPDATE, "", nil); err != nil {+ if err := s.getMeshAdapter().PublishEvent(r.Context(), api.MeshEvent_POLICY_UPDATE, "", nil); err != nil {logger.Warnf("Failed to publish POLICY_UPDATE event to mesh: %v", err)}@@ -1493,7 +1503,7 @@ func (s *Server) HandleAdminRevoke(w http.ResponseWriter, r *http.Request) {return}- if err := s.mesh.PublishEvent(ctx, api.MeshEvent_BANNED, req.PeerId, nil); err != nil {+ if err := s.getMeshAdapter().PublishEvent(ctx, api.MeshEvent_BANNED, req.PeerId, nil); err != nil {logger.Warnf("Failed to publish BANNED event for node %s to mesh: %v", req.PeerId, err)}@@ -1731,7 +1741,7 @@ func (s *Server) HandleUserRevoke(w http.ResponseWriter, r *http.Request) {return}- if err := s.mesh.PublishEvent(ctx, api.MeshEvent_BANNED, peerID, nil); err != nil {+ if err := s.getMeshAdapter().PublishEvent(ctx, api.MeshEvent_BANNED, peerID, nil); err != nil {logger.Warnf("Failed to publish BANNED event for node %s to mesh: %v", peerID, err)}