Merge e007726 into cb33f0a

jaegertracing · Sep 21, 2023 · 2244b01 · 2244b01
2 parents cb33f0a + e007726
commit 2244b01
Show file tree

Hide file tree

Showing 12 changed files with 85 additions and 64 deletions.
diff --git a/pkg/cronjob/es_index_cleaner.go b/pkg/cronjob/es_index_cleaner.go
@@ -4,6 +4,7 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/operator-framework/operator-lib/proxy"
 	"github.com/spf13/viper"
 	batchv1 "k8s.io/api/batch/v1"
 	batchv1beta1 "k8s.io/api/batch/v1beta1"
@@ -30,6 +31,7 @@ func CreateEsIndexCleaner(jaeger *v1.Jaeger) runtime.Object {
 
 	envFromSource := util.CreateEnvsFromSecret(jaeger.Spec.Storage.SecretName)
 	envs := EsScriptEnvVars(jaeger.Spec.Storage.Options)
+	envs = append(envs, proxy.ReadProxyVarsFromEnv()...)
 	if val, ok := jaeger.Spec.Storage.Options.StringMap()["es.use-aliases"]; ok && strings.EqualFold(val, "true") {
 		envs = append(envs, corev1.EnvVar{Name: "ROLLOVER", Value: "true"})
 	}

diff --git a/pkg/cronjob/es_rollover.go b/pkg/cronjob/es_rollover.go
@@ -5,13 +5,13 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/operator-framework/operator-lib/proxy"
 	"github.com/spf13/viper"
-	"k8s.io/apimachinery/pkg/runtime"
-
 	batchv1 "k8s.io/api/batch/v1"
 	batchv1beta1 "k8s.io/api/batch/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 
 	v1 "github.com/jaegertracing/jaeger-operator/apis/v1"
 	"github.com/jaegertracing/jaeger-operator/pkg/account"
@@ -97,6 +97,7 @@ func rollover(jaeger *v1.Jaeger) runtime.Object {
 
 func createTemplate(name, action string, jaeger *v1.Jaeger, envs []corev1.EnvVar) *corev1.PodTemplateSpec {
 	envFromSource := util.CreateEnvsFromSecret(jaeger.Spec.Storage.SecretName)
+	envs = append(envs, proxy.ReadProxyVarsFromEnv()...)
 	baseCommonSpec := v1.JaegerCommonSpec{
 		Annotations: map[string]string{
 			"prometheus.io/scrape":    "false",

diff --git a/pkg/cronjob/spark_dependencies.go b/pkg/cronjob/spark_dependencies.go
@@ -4,14 +4,13 @@ import (
 	"strconv"
 	"strings"
 
-	"k8s.io/apimachinery/pkg/runtime"
-
+	"github.com/operator-framework/operator-lib/proxy"
+	"github.com/spf13/viper"
 	batchv1 "k8s.io/api/batch/v1"
 	batchv1beta1 "k8s.io/api/batch/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
-	"github.com/spf13/viper"
+	"k8s.io/apimachinery/pkg/runtime"
 
 	v1 "github.com/jaegertracing/jaeger-operator/apis/v1"
 	"github.com/jaegertracing/jaeger-operator/pkg/account"
@@ -35,6 +34,7 @@ func CreateSparkDependencies(jaeger *v1.Jaeger) runtime.Object {
 		{Name: "JAVA_OPTS", Value: jaeger.Spec.Storage.Dependencies.JavaOpts},
 	}
 	envVars = append(envVars, getStorageEnvs(jaeger.Spec.Storage)...)
+	envVars = append(envVars, proxy.ReadProxyVarsFromEnv()...)
 
 	envFromSource := util.CreateEnvsFromSecret(jaeger.Spec.Storage.SecretName)
 

diff --git a/pkg/deployment/agent.go b/pkg/deployment/agent.go
@@ -6,6 +6,7 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/operator-framework/operator-lib/proxy"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -148,6 +149,7 @@ func (a *Agent) Get() *appsv1.DaemonSet {
 						Image: util.ImageName(a.jaeger.Spec.Agent.Image, "jaeger-agent-image"),
 						Name:  "jaeger-agent-daemonset",
 						Args:  args,
+						Env:   proxy.ReadProxyVarsFromEnv(),
 						Ports: []corev1.ContainerPort{
 							{
 								ContainerPort: zkCompactTrft,

diff --git a/pkg/deployment/all_in_one.go b/pkg/deployment/all_in_one.go
@@ -5,21 +5,21 @@ import (
 	"sort"
 	"strconv"
 
-	"github.com/jaegertracing/jaeger-operator/pkg/autodetect"
-	"github.com/jaegertracing/jaeger-operator/pkg/storage"
-
+	"github.com/operator-framework/operator-lib/proxy"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 
 	v1 "github.com/jaegertracing/jaeger-operator/apis/v1"
 	"github.com/jaegertracing/jaeger-operator/pkg/account"
+	"github.com/jaegertracing/jaeger-operator/pkg/autodetect"
 	"github.com/jaegertracing/jaeger-operator/pkg/config/ca"
 	"github.com/jaegertracing/jaeger-operator/pkg/config/sampling"
 	"github.com/jaegertracing/jaeger-operator/pkg/config/tls"
 	configmap "github.com/jaegertracing/jaeger-operator/pkg/config/ui"
 	"github.com/jaegertracing/jaeger-operator/pkg/service"
+	"github.com/jaegertracing/jaeger-operator/pkg/storage"
 	"github.com/jaegertracing/jaeger-operator/pkg/util"
 )
 
@@ -152,6 +152,7 @@ func (a *AllInOne) Get() *appsv1.Deployment {
 			Value: strconv.FormatBool(jaegerDisabled),
 		},
 	}
+	envVars = append(envVars, proxy.ReadProxyVarsFromEnv()...)
 
 	ports := []corev1.ContainerPort{
 		{

diff --git a/pkg/deployment/collector.go b/pkg/deployment/collector.go
@@ -5,6 +5,7 @@ import (
 	"sort"
 	"strconv"
 
+	"github.com/operator-framework/operator-lib/proxy"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -137,6 +138,7 @@ func (c *Collector) Get() *appsv1.Deployment {
 			Value: ":9411",
 		},
 	}
+	envVars = append(envVars, proxy.ReadProxyVarsFromEnv()...)
 
 	ports := []corev1.ContainerPort{
 		{

diff --git a/pkg/deployment/ingester.go b/pkg/deployment/ingester.go
@@ -5,6 +5,7 @@ import (
 	"sort"
 	"strconv"
 
+	"github.com/operator-framework/operator-lib/proxy"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -124,6 +125,13 @@ func (i *Ingester) Get() *appsv1.Deployment {
 		nodeSelector = i.jaeger.Spec.Ingester.NodeSelector
 	}
 
+	envVars := []corev1.EnvVar{
+		{
+			Name:  "SPAN_STORAGE_TYPE",
+			Value: string(i.jaeger.Spec.Storage.Type),
+		},
+	}
+	envVars = append(envVars, proxy.ReadProxyVarsFromEnv()...)
 	deployment := &appsv1.Deployment{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: "apps/v1",
@@ -155,13 +163,10 @@ func (i *Ingester) Get() *appsv1.Deployment {
 				Spec: corev1.PodSpec{
 					ImagePullSecrets: i.jaeger.Spec.ImagePullSecrets,
 					Containers: []corev1.Container{{
-						Image: util.ImageName(i.jaeger.Spec.Ingester.Image, "jaeger-ingester-image"),
-						Name:  "jaeger-ingester",
-						Args:  options,
-						Env: []corev1.EnvVar{{
-							Name:  "SPAN_STORAGE_TYPE",
-							Value: string(i.jaeger.Spec.Storage.Type),
-						}},
+						Image:        util.ImageName(i.jaeger.Spec.Ingester.Image, "jaeger-ingester-image"),
+						Name:         "jaeger-ingester",
+						Args:         options,
+						Env:          envVars,
 						VolumeMounts: commonSpec.VolumeMounts,
 						EnvFrom:      envFromSource,
 						Ports: []corev1.ContainerPort{

diff --git a/pkg/deployment/query.go b/pkg/deployment/query.go
@@ -5,6 +5,7 @@ import (
 	"sort"
 	"strconv"
 
+	"github.com/operator-framework/operator-lib/proxy"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -120,6 +121,21 @@ func (q *Query) Get() *appsv1.Deployment {
 		nodeSelector = q.jaeger.Spec.Query.NodeSelector
 	}
 
+	envVars := []corev1.EnvVar{
+		{
+			Name:  "SPAN_STORAGE_TYPE",
+			Value: string(q.jaeger.Spec.Storage.Type),
+		},
+		{
+			Name:  "METRICS_STORAGE_TYPE",
+			Value: string(q.jaeger.Spec.Query.MetricsStorage.Type),
+		},
+		{
+			Name:  "JAEGER_DISABLED",
+			Value: strconv.FormatBool(jaegerDisabled),
+		},
+	}
+	envVars = append(envVars, proxy.ReadProxyVarsFromEnv()...)
 	deployment := &appsv1.Deployment{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: "apps/v1",
@@ -152,23 +168,10 @@ func (q *Query) Get() *appsv1.Deployment {
 				Spec: corev1.PodSpec{
 					ImagePullSecrets: q.jaeger.Spec.ImagePullSecrets,
 					Containers: []corev1.Container{{
-						Image: util.ImageName(q.jaeger.Spec.Query.Image, "jaeger-query-image"),
-						Name:  "jaeger-query",
-						Args:  options,
-						Env: []corev1.EnvVar{
-							{
-								Name:  "SPAN_STORAGE_TYPE",
-								Value: string(q.jaeger.Spec.Storage.Type),
-							},
-							{
-								Name:  "METRICS_STORAGE_TYPE",
-								Value: string(q.jaeger.Spec.Query.MetricsStorage.Type),
-							},
-							{
-								Name:  "JAEGER_DISABLED",
-								Value: strconv.FormatBool(jaegerDisabled),
-							},
-						},
+						Image:        util.ImageName(q.jaeger.Spec.Query.Image, "jaeger-query-image"),
+						Name:         "jaeger-query",
+						Args:         options,
+						Env:          envVars,
 						VolumeMounts: commonSpec.VolumeMounts,
 						EnvFrom:      envFromSource,
 						Ports: []corev1.ContainerPort{

diff --git a/pkg/inject/oauth_proxy.go b/pkg/inject/oauth_proxy.go
@@ -5,6 +5,7 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/operator-framework/operator-lib/proxy"
 	"github.com/spf13/viper"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -111,6 +112,7 @@ func getOAuthProxyContainer(jaeger *v1.Jaeger) corev1.Container {
 			},
 		},
 		Resources: commonSpec.Resources,
+		Env:       proxy.ReadProxyVarsFromEnv(),
 	}
 }
 

diff --git a/pkg/inject/sidecar.go b/pkg/inject/sidecar.go
@@ -7,6 +7,7 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/operator-framework/operator-lib/proxy"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
@@ -209,6 +210,25 @@ func getJaeger(name string, jaegers *v1.JaegerList) *v1.Jaeger {
 
 func container(jaeger *v1.Jaeger, dep *appsv1.Deployment, agentIdx int) corev1.Container {
 	args := jaeger.Spec.Agent.Options.ToArgs()
+	envs := []corev1.EnvVar{
+		{
+			Name: envVarPodName,
+			ValueFrom: &corev1.EnvVarSource{
+				FieldRef: &corev1.ObjectFieldSelector{
+					FieldPath: "metadata.name",
+				},
+			},
+		},
+		{
+			Name: envVarHostIP,
+			ValueFrom: &corev1.EnvVarSource{
+				FieldRef: &corev1.ObjectFieldSelector{
+					FieldPath: "status.hostIP",
+				},
+			},
+		},
+	}
+	envs = append(envs, proxy.ReadProxyVarsFromEnv()...)
 
 	// we only add the grpc host if we are adding the reporter type and there's no explicit value yet
 	if len(util.FindItem("--reporter.grpc.host-port=", args)) == 0 {
@@ -275,24 +295,7 @@ func container(jaeger *v1.Jaeger, dep *appsv1.Deployment, agentIdx int) corev1.C
 		Image: util.ImageName(jaeger.Spec.Agent.Image, "jaeger-agent-image"),
 		Name:  "jaeger-agent",
 		Args:  args,
-		Env: []corev1.EnvVar{
-			{
-				Name: envVarPodName,
-				ValueFrom: &corev1.EnvVarSource{
-					FieldRef: &corev1.ObjectFieldSelector{
-						FieldPath: "metadata.name",
-					},
-				},
-			},
-			{
-				Name: envVarHostIP,
-				ValueFrom: &corev1.EnvVarSource{
-					FieldRef: &corev1.ObjectFieldSelector{
-						FieldPath: "status.hostIP",
-					},
-				},
-			},
-		},
+		Env:   envs,
 		Ports: []corev1.ContainerPort{
 			{
 				ContainerPort: zkCompactTrft,

diff --git a/pkg/storage/elasticsearch.go b/pkg/storage/elasticsearch.go
@@ -53,7 +53,7 @@ type ElasticsearchDeployment struct {
 }
 
 func (ed *ElasticsearchDeployment) injectArguments(container *corev1.Container) {
-	container.Args = append(container.Args, fmt.Sprintf("--es.server-urls=https://%s:9200", ed.Jaeger.Spec.Storage.Elasticsearch.Name))
+	container.Args = append(container.Args, fmt.Sprintf("--es.server-urls=https://%s.%s.svc.cluster.local:9200", ed.Jaeger.Spec.Storage.Elasticsearch.Name, ed.Jaeger.Namespace))
 	if util.FindItem("--es.tls=", container.Args) == "" && util.FindItem("--es.tls.enabled=", container.Args) == "" {
 		container.Args = append(container.Args, "--es.tls.enabled=true")
 	}
@@ -75,7 +75,7 @@ func (ed *ElasticsearchDeployment) injectArguments(container *corev1.Container)
 			calculateReplicaShards(ed.Jaeger.Spec.Storage.Elasticsearch.RedundancyPolicy, int(ed.Jaeger.Spec.Storage.Elasticsearch.NodeCount))))
 	}
 	if strings.EqualFold(util.FindItem("--es-archive.enabled", container.Args), "--es-archive.enabled=true") {
-		container.Args = append(container.Args, fmt.Sprintf("--es-archive.server-urls=https://%s:9200", ed.Jaeger.Spec.Storage.Elasticsearch.Name))
+		container.Args = append(container.Args, fmt.Sprintf("--es-archive.server-urls=https://%s.%s.svc.cluster.local:9200", ed.Jaeger.Spec.Storage.Elasticsearch.Name, ed.Jaeger.Namespace))
 		if util.FindItem("--es-archive.tls=", container.Args) == "" && util.FindItem("--es-archive.tls.enabled=", container.Args) == "" {
 			container.Args = append(container.Args, "--es-archive.tls.enabled=true")
 		}
@@ -134,7 +134,7 @@ func (ed *ElasticsearchDeployment) InjectSecretsConfiguration(p *corev1.PodSpec)
 	// we assume jaeger containers are first
 	if len(p.Containers) > 0 {
 		// the size of arguments array should be always 2
-		p.Containers[0].Args[1] = fmt.Sprintf("https://%s:9200", ed.Jaeger.Spec.Storage.Elasticsearch.Name)
+		p.Containers[0].Args[1] = fmt.Sprintf("https://%s.%s.svc.cluster.local:9200", ed.Jaeger.Spec.Storage.Elasticsearch.Name, ed.Jaeger.Namespace)
 		p.Containers[0].Env = append(p.Containers[0].Env,
 			corev1.EnvVar{Name: "ES_TLS_ENABLED", Value: "true"},
 			corev1.EnvVar{Name: "ES_TLS_CA", Value: ed.getCertCaPath()},