LOG-7058: Revert adding liveness probe to Vector collector container

Author: vparfonov

internal/collector/collector.go

@@ -32,8 +32,6 @@ const (
 	MetricsPortName                 = "metrics"
 	metricsVolumeName               = "metrics"
 	metricsVolumePath               = "/etc/collector/metrics"
-	HealthPortName                  = "health"
-	HealthPort                      = int32(24686)
 	saTokenVolumeName               = "sa-token"
 	saTokenExpirationSecs           = 3600 //1 hour
 	sourcePodsName                  = "varlogpods"
@@ -202,11 +200,6 @@ func (f *Factory) NewCollectorContainer(inputs internalobs.Inputs, outputs inter
 			ContainerPort: MetricsPort,
 			Protocol:      v1.ProtocolTCP,
 		},
-		{
-			Name:          HealthPortName,
-			ContainerPort: HealthPort,
-			Protocol:      v1.ProtocolTCP,
-		},
 	}
 	collector.Env = []v1.EnvVar{
 		{Name: "COLLECTOR_CONF_HASH", Value: f.ConfigHash},
@@ -247,8 +240,6 @@ func (f *Factory) NewCollectorContainer(inputs internalobs.Inputs, outputs inter
 		AddSecurityContextTo(collector)
 	}
 
-	AddLivenessProbe(collector)
-
 	AddVolumeMounts(collector, secretVolumes, common.SecretBasePath)
 	AddVolumeMounts(collector, configmapVolumes, func(name string) string {
 		return common.ConfigMapBasePath(strings.TrimPrefix(name, "config-"))
@@ -264,23 +255,6 @@ func (f *Factory) NewCollectorContainer(inputs internalobs.Inputs, outputs inter
 	return collector
 }
 
-// AddLivenessProbe to collector container
-func AddLivenessProbe(collector *v1.Container) {
-	livenessProbe := &v1.Probe{
-		ProbeHandler: v1.ProbeHandler{
-			HTTPGet: &v1.HTTPGetAction{
-				Path:   "/health",
-				Port:   intstr.FromInt32(HealthPort),
-				Scheme: v1.URISchemeHTTP,
-			},
-		},
-		InitialDelaySeconds: 10,
-		FailureThreshold:    5,
-	}
-
-	collector.LivenessProbe = livenessProbe
-}
-
 func sanitizeVolumeName(input string) string {
 	return strings.ReplaceAll(input, ".", "")
 }

internal/collector/collector_test.go

@@ -137,18 +137,6 @@ var _ = Describe("Factory#Daemonset", func() {
 				Expect(collector.Env).To(IncludeEnvVar(v1.EnvVar{Name: "VECTOR_LOG", Value: logLevelDebug}))
 			})
 
-			It("should has Liveness Probe", func() {
-				podSpec = *factory.NewPodSpec(nil, obs.ClusterLogForwarderSpec{}, "1234", tls.GetClusterTLSProfileSpec(nil), constants.OpenshiftNS)
-				collector = podSpec.Containers[0]
-				livenessProbe := collector.LivenessProbe
-				Expect(livenessProbe).ToNot(BeNil())
-				Expect(livenessProbe.HTTPGet).ToNot(BeNil())
-				Expect(livenessProbe.HTTPGet.Path).To(Equal("/health"))
-				Expect(livenessProbe.HTTPGet.Port).ToNot(BeNil())
-				Expect(livenessProbe.HTTPGet.Port.IntVal).To(Equal(HealthPort))
-				Expect(livenessProbe.FailureThreshold).To(BeEquivalentTo(5))
-			})
-
 			Context("the volume mounts", func() {
 				It("should mount all output configmaps", func() {
 					Expect(collector.VolumeMounts).To(IncludeVolumeMount(

internal/generator/vector/conf/complex.toml

@@ -3,7 +3,6 @@ data_dir = "/var/lib/vector/openshift-logging/my-forwarder"
 
 [api]
 enabled = true
-address = "0.0.0.0:24686"
 
 # Load sensitive data from files
 [secret.kubernetes_secret]

internal/generator/vector/conf/complex_http_receiver.toml

@@ -3,7 +3,6 @@ data_dir = "/var/lib/vector/openshift-logging/my-forwarder"
 
 [api]
 enabled = true
-address = "0.0.0.0:24686"
 
 # Load sensitive data from files
 [secret.kubernetes_secret]

internal/generator/vector/conf/container.toml

@@ -3,7 +3,6 @@ data_dir = "/var/lib/vector/openshift-logging/my-forwarder"
 
 [api]
 enabled = true
-address = "0.0.0.0:24686"
 
 # Load sensitive data from files
 [secret.kubernetes_secret]

internal/generator/vector/conf/global.go

@@ -1,11 +1,9 @@
 package conf
 
 import (
-	"github.com/openshift/cluster-logging-operator/internal/collector"
 	"github.com/openshift/cluster-logging-operator/internal/collector/vector"
 	"github.com/openshift/cluster-logging-operator/internal/generator/framework"
 	"github.com/openshift/cluster-logging-operator/internal/generator/vector/output/common"
-	"strconv"
 )
 
 func Global(namespace, forwarderName string) []framework.Element {
@@ -41,7 +39,6 @@ data_dir = "{{.DataDir}}"
 
 [api]
 enabled = true
-address = "0.0.0.0:` + strconv.Itoa(int(collector.HealthPort)) + `"
 {{end}}
 `
 }

internal/generator/vector/conf/global_test.go

@@ -18,7 +18,6 @@ data_dir = "/var/lib/vector/openshift-logging/my-forwarder"
 
 [api]
 enabled = true
-address = "0.0.0.0:24686"
 
 # Load sensitive data from files
 [secret.kubernetes_secret]
@@ -35,7 +34,6 @@ expire_metrics_secs = 60
 
 [api]
 enabled = true
-address = "0.0.0.0:24686"
 
 # Load sensitive data from files
 [secret.kubernetes_secret]

test/functional/misc/vector_api_cli_test.go

@@ -25,7 +25,7 @@ var _ = Describe("[Functional][Misc][API_CLI] Functional test", func() {
 	Context("invoking vector CLI commands that talk to the vector API", func() {
 		It("should work", func() {
 			Expect(framework.Deploy()).To(BeNil())
-			out, _ := framework.RunCommand(constants.CollectorName, `curl`, `-sv`, `-m`, `5`, `--connect-timeout`, `3`, `http://127.0.0.1:24686/health`)
+			out, _ := framework.RunCommand(constants.CollectorName, `curl`, `-sv`, `-m`, `5`, `--connect-timeout`, `3`, `http://127.0.0.1:8686/health`)
 			Expect(out).To(ContainSubstring(`{"ok":true}`))
 		})
 	})