Merge branch 'main' of github.com:keyval-dev/odigos into gen-2294-odi…

…gos-set-config-command
odigos-io · Jan 29, 2025 · 28e1837 · 28e1837
2 parents 610293f + 7af8d56
commit 28e1837
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 7 deletions.
diff --git a/cli/cmd/install.go b/cli/cmd/install.go
@@ -39,6 +39,7 @@ var (
 	userInputIgnoredContainers []string
 	userInputInstallProfiles   []string
 	uiMode                     string
+	centralBackendURL          string
 
 	instrumentorImage string
 	odigletImage      string
@@ -236,6 +237,7 @@ func createOdigosConfig(odigosTier common.OdigosTier) common.OdigosConfiguration
 		AutoscalerImage:           autoScalerImage,
 		Profiles:                  selectedProfiles,
 		UiMode:                    common.UiMode(uiMode),
+		CentralBackendURL:         centralBackendURL,
 	}
 }
 
@@ -267,6 +269,7 @@ func init() {
 	installCmd.Flags().StringSliceVar(&userInputIgnoredContainers, "ignore-container", k8sconsts.DefaultIgnoredContainers, "container names to exclude from instrumentation (useful for sidecar container)")
 	installCmd.Flags().StringSliceVar(&userInputInstallProfiles, "profile", []string{}, "install preset profiles with a specific configuration")
 	installCmd.Flags().StringVarP(&uiMode, "ui-mode", "", string(common.NormalUiMode), "set the UI mode (one-of: normal, readonly)")
+	installCmd.Flags().StringVar(&centralBackendURL, "central-backend-url", "", "URL for centralized Odigos backend")
 
 	if OdigosVersion != "" {
 		versionFlag = OdigosVersion

diff --git a/cli/cmd/resources/README.md b/cli/cmd/resources/README.md
@@ -34,7 +34,7 @@ In this doc, we'll keep track of the permissions requested across different reso
 | UI           | apps              | deployments, statefulsets, daemonsets                      | \*             | get, list                                       | Needed to get workloads.                                                                                                  |
 | UI           | apps              | replicasets                                                | \*             | get, list                                       | Needed for describing application and resource relationships.                                                             |
 | UI           | odigos.io         | instrumentationconfigs, instrumentationinstances           | \*             | get, list, watch                                | Monitors and retrieves configurations for instrumentation.                                                                |
-| UI           | odigos.io         | sources                                                    | \*             | get, list, create, delete                       | Manages sources for instrumentation and monitoring.                                                                       |
+| UI           | odigos.io         | sources                                                    | \*             | get, list, create, patch, delete                | Manages sources for instrumentation. Patch is needed to update service name.                                              |
 | UI           | actions.odigos.io | \*                                                         | \*             | get, list, create, patch, update, delete        | Handles pipeline actions for custom logic.                                                                                |
 
 ---

diff --git a/cli/cmd/resources/ui.go b/cli/cmd/resources/ui.go
@@ -308,10 +308,11 @@ func NewUIClusterRole(readonly bool) *rbacv1.ClusterRole {
 				Resources: []string{"instrumentationconfigs", "instrumentationinstances"},
 				Verbs:     []string{"get", "list", "watch"},
 			},
-			{ // Needed to instrument / uninstrument sources
+			{ // Needed to instrument / uninstrument sources.
+				// Patch is needed to update service name.
 				APIGroups: []string{"odigos.io"},
 				Resources: []string{"sources"},
-				Verbs:     []string{"get", "list", "create", "delete"},
+				Verbs:     []string{"get", "list", "create", "patch", "delete"},
 			},
 		}
 	}

diff --git a/common/odigos_config.go b/common/odigos_config.go
@@ -111,4 +111,5 @@ type OdigosConfiguration struct {
 	Profiles                  []ProfileName                  `json:"profiles,omitempty"`
 	AllowConcurrentAgents     *bool                          `json:"allowConcurrentAgents,omitempty"`
 	UiMode                    UiMode                         `json:"uiMode,omitempty"`
+	CentralBackendURL         string                         `json:"centralBackendURL,omitempty"`
 }
diff --git a/docs/cli/odigos_install.mdx b/docs/cli/odigos_install.mdx
@@ -38,6 +38,7 @@ odigos install --onprem-token ${ODIGOS_TOKEN} --profile ${YOUR_ENTERPRISE_PROFIL
 ```
   -k, --api-key string                 api key for odigos cloud
       --autoscaler-image string        autoscaler container image name (default "keyval/odigos-autoscaler")
+      --central-backend-url string     URL for centralized Odigos backend
   -h, --help                           help for install
       --ignore-container strings       container names to exclude from instrumentation (useful for sidecar container) (default [istio-proxy,vault-agent,filebeat,linkerd-proxy,fluentd,akeyless-init])
       --ignore-namespace strings       namespaces not to show in odigos ui (default [kube-system,local-path-storage,istio-system,linkerd,kube-node-lease])

diff --git a/frontend/webapp/cypress/e2e/03-sources.cy.ts b/frontend/webapp/cypress/e2e/03-sources.cy.ts
@@ -50,9 +50,9 @@ describe('Sources CRUD', () => {
             getCrdIds({ namespace, crdName, expectedError: '', expectedLength: 5 }, (crdIds) => {
               const crdId = CRD_IDS.SOURCE;
               expect(crdIds).includes(crdId);
-              // awaitToast({ withSSE: false, message: TEXTS.NOTIF_SOURCES_UPDATED(1) }, () => {
-              //   getCrdById({ namespace, crdName, crdId, expectedError: '', expectedKey: 'serviceName', expectedValue: TEXTS.UPDATED_NAME });
-              // });
+              awaitToast({ withSSE: false, message: TEXTS.NOTIF_SOURCES_UPDATED(1) }, () => {
+                getCrdById({ namespace, crdName, crdId, expectedError: '', expectedKey: 'serviceName', expectedValue: TEXTS.UPDATED_NAME });
+              });
             });
           });
         },

diff --git a/helm/odigos/templates/odigos-config-cm.yaml b/helm/odigos/templates/odigos-config-cm.yaml
@@ -18,6 +18,9 @@ data:
     {{- if .Values.ui.uiMode }}
     uiMode: {{ .Values.ui.uiMode }}
     {{- end }}
+    {{- if .Values.ui.centralBackendURL }}
+    centralBackendURL: {{ .Values.ui.centralBackendURL }}
+    {{- end }}
     {{- if .Values.collectorGateway }}
     collectorGateway:
       {{- with .Values.collectorGateway.minReplicas }}

diff --git a/helm/odigos/templates/ui/clusterrole.yaml b/helm/odigos/templates/ui/clusterrole.yaml
@@ -61,6 +61,7 @@ rules:
       - get
       - list
       {{- if ne .Values.ui.uiMode "readonly" }}
+      - patch
       - create
       - delete
       {{- end }}
diff --git a/helm/odigos/values.yaml b/helm/odigos/values.yaml
@@ -124,6 +124,7 @@ ui:
   #  - Setting this to "readonly" will disable the ability to create, update, or delete objects in the UI.
   #  - If not set, the UI will be in normal mode.
   uiMode: 'normal'
+  centralBackendURL: ''
 
 instrumentor:
   deleteLangDetectionPods: true
@@ -176,4 +177,3 @@ gke:
   enabled: false
 
 profiles: []
-
-Original file line number
+Diff line change
@@ Expand Up / @@ -61,6 +61,7 @@ rules: @@
           - get
           - list
           {{- if ne .Values.ui.uiMode "readonly" }}
+          - patch
           - create
           - delete
           {{- end }}