feat: Add CLI flags for overwriting instrumentor and odiglet (#469)

odigos-io · Sep 4, 2023 · 32d6057 · 32d6057
1 parent c3c4a51
commit 32d6057
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 566 deletions.
diff --git a/cli/cmd/install.go b/cli/cmd/install.go
@@ -271,4 +271,6 @@ func init() {
 	installCmd.Flags().BoolVar(&skipWait, "nowait", false, "Skip waiting for pods to be ready")
 	installCmd.Flags().BoolVar(&telemetryEnabled, "telemetry", true, "Enable telemetry")
 	installCmd.Flags().BoolVar(&sidecarInstrumentation, "sidecar-instrumentation", false, "Used sidecars for eBPF instrumentations")
+	installCmd.Flags().StringVar(&resources.OdigletImage, "odiglet-image", "keyval/odigos-odiglet", "odiglet container image")
+	installCmd.Flags().StringVar(&resources.InstrumentorImage, "instrumentor-image", "keyval/odigos-instrumentor", "instrumentor container image")
 }
diff --git a/cli/cmd/resources/instrumentor.go b/cli/cmd/resources/instrumentor.go
@@ -12,9 +12,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 )
 
-const (
-	instrumentorImage = "keyval/odigos-instrumentor"
-)
+var InstrumentorImage string
 
 func NewInstrumentorServiceAccount() *corev1.ServiceAccount {
 	return &corev1.ServiceAccount{
@@ -422,7 +420,7 @@ func NewInstrumentorDeployment(version string, telemetryEnabled bool, sidecarIns
 					Containers: []corev1.Container{
 						{
 							Name:  "manager",
-							Image: fmt.Sprintf("%s:%s", instrumentorImage, version),
+							Image: fmt.Sprintf("%s:%s", InstrumentorImage, version),
 							Command: []string{
 								"/app",
 							},

diff --git a/cli/cmd/resources/odiglet.go b/cli/cmd/resources/odiglet.go
@@ -10,9 +10,9 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-const (
-	odigletImage = "keyval/odigos-odiglet"
-)
+const ()
+
+var OdigletImage string
 
 func NewOdigletServiceAccount() *corev1.ServiceAccount {
 	return &corev1.ServiceAccount{
@@ -262,7 +262,7 @@ func NewOdigletDaemonSet(version string) *appsv1.DaemonSet {
 					Containers: []corev1.Container{
 						{
 							Name:  "odiglet",
-							Image: fmt.Sprintf("%s:%s", odigletImage, version),
+							Image: fmt.Sprintf("%s:%s", OdigletImage, version),
 							Env: []corev1.EnvVar{
 								{
 									Name: "NODE_NAME",