Remove deprecated JaegerServiceEndpoint

kyma-project · Aug 7, 2023 · 1545bae · 1545bae
1 parent 2d1d652
commit 1545bae
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 11 deletions.
diff --git a/components/function-controller/internal/controllers/serverless/config.go b/components/function-controller/internal/controllers/serverless/config.go
@@ -6,7 +6,6 @@ import (
 
 type FunctionConfig struct {
 	PublisherProxyAddress                       string        `envconfig:"optional"`
-	JaegerServiceEndpoint                       string        `envconfig:"optional"`
 	TraceCollectorEndpoint                      string        `envconfig:"optional"`
 	ImageRegistryDefaultDockerConfigSecretName  string        `envconfig:"default=serverless-registry-config-default"`
 	ImageRegistryExternalDockerConfigSecretName string        `envconfig:"default=serverless-registry-config"`

diff --git a/components/function-controller/internal/controllers/serverless/deployment.go b/components/function-controller/internal/controllers/serverless/deployment.go
@@ -41,7 +41,6 @@ func stateFnCheckDeployments(ctx context.Context, r *reconciler, s *systemState)
 
 	args := buildDeploymentArgs{
 		DockerPullAddress:      r.cfg.docker.PullAddress,
-		JaegerServiceEndpoint:  r.cfg.fn.JaegerServiceEndpoint,
 		TraceCollectorEndpoint: r.cfg.fn.TraceCollectorEndpoint,
 		PublisherProxyAddress:  r.cfg.fn.PublisherProxyAddress,
 		ImagePullAccountName:   r.cfg.fn.ImagePullAccountName,

diff --git a/components/function-controller/internal/controllers/serverless/system_state.go b/components/function-controller/internal/controllers/serverless/system_state.go
@@ -390,7 +390,6 @@ func (s *systemState) specialDeploymentAnnotations() map[string]string {
 
 type buildDeploymentArgs struct {
 	DockerPullAddress      string
-	JaegerServiceEndpoint  string
 	TraceCollectorEndpoint string
 	PublisherProxyAddress  string
 	ImagePullAccountName   string
@@ -408,7 +407,6 @@ func (s *systemState) buildDeployment(cfg buildDeploymentArgs) appsv1.Deployment
 
 	deploymentEnvs := buildDeploymentEnvs(
 		s.instance.GetNamespace(),
-		cfg.JaegerServiceEndpoint,
 		cfg.TraceCollectorEndpoint,
 		cfg.PublisherProxyAddress,
 	)

diff --git a/components/function-controller/internal/controllers/serverless/utils.go b/components/function-controller/internal/controllers/serverless/utils.go
@@ -155,10 +155,9 @@ processing_next_item:
 	return out
 }
 
-func buildDeploymentEnvs(namespace, jaegerServiceEndpoint, traceCollectorEndpoint, publisherProxyAddress string) []corev1.EnvVar {
+func buildDeploymentEnvs(namespace, traceCollectorEndpoint, publisherProxyAddress string) []corev1.EnvVar {
 	return []corev1.EnvVar{
 		{Name: "SERVICE_NAMESPACE", Value: namespace},
-		{Name: "JAEGER_SERVICE_ENDPOINT", Value: jaegerServiceEndpoint},
 		{Name: "TRACE_COLLECTOR_ENDPOINT", Value: traceCollectorEndpoint},
 		{Name: "PUBLISHER_PROXY_ADDRESS", Value: publisherProxyAddress},
 		{Name: "FUNC_HANDLER", Value: "main"},

diff --git a/resources/serverless/templates/deployment.yaml b/resources/serverless/templates/deployment.yaml
@@ -118,7 +118,6 @@ spec:
             {{ include "createEnv" ( dict "name" "APP_KUBERNETES_SECRET_REQUEUE_DURATION" "value" .Values.containers.manager.envs.secretRequeueDuration "context" . ) | nindent 12 }}
             {{ include "createEnv" ( dict "name" "APP_KUBERNETES_SERVICE_ACCOUNT_REQUEUE_DURATION" "value" .Values.containers.manager.envs.serviceAccountRequeueDuration "context" . ) | nindent 12 }}
             {{ include "createEnv" ( dict "name" "APP_KUBERNETES_EXCLUDED_NAMESPACES" "value" .Values.containers.manager.envs.namespaceExcludedNames "context" . ) | nindent 12 }}
-            {{ include "createEnv" ( dict "name" "APP_FUNCTION_JAEGER_SERVICE_ENDPOINT" "value" .Values.containers.manager.envs.functionJaegerServiceEndpoint "context" . ) | nindent 12 }}
             {{ include "createEnv" ( dict "name" "APP_FUNCTION_TRACE_COLLECTOR_ENDPOINT" "value" .Values.containers.manager.envs.functionTraceCollectorEndpoint "context" . ) | nindent 12 }}
             {{ include "createEnv" ( dict "name" "APP_FUNCTION_PUBLISHER_PROXY_ADDRESS" "value" .Values.containers.manager.envs.functionPublisherProxyAddress "context" . ) | nindent 12 }}
             {{ include "createEnv" ( dict "name" "APP_FUNCTION_IMAGE_REGISTRY_DEFAULT_DOCKER_CONFIG_SECRET_NAME" "value" .Values.containers.manager.envs.imageRegistryDefaultDockerConfigSecretName "context" . ) | nindent 12 }}

diff --git a/resources/serverless/values.yaml b/resources/serverless/values.yaml
@@ -215,10 +215,6 @@ containers:
         value: '{{ template "fullname" . }}-function'
       targetCPUUtilizationPercentage:
         value: "50"
-      # Deprecated as of kyma 2.8
-      # TODO : remove this ENV in 2.10 (two version compatibility rule for open source)
-      functionJaegerServiceEndpoint:
-        value: "http://tracing-jaeger-collector.kyma-system.svc.cluster.local:14268/api/traces"
       functionTraceCollectorEndpoint:
         value: "http://telemetry-otlp-traces.kyma-system.svc.cluster.local:4318/v1/traces"
       functionPublisherProxyAddress: