Skip to content

Commit 3b746c5

Browse files
authored
Revert "Make readiness probes independent of the host/container network (#2528)" (#3062)
This reverts commit c580860.
1 parent 9a8e161 commit 3b746c5

File tree

4 files changed

+27
-26
lines changed

4 files changed

+27
-26
lines changed

pkg/controller/apmserver/apmserver_controller_test.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
corev1 "k8s.io/api/core/v1"
1515
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1616
"k8s.io/apimachinery/pkg/runtime"
17+
"k8s.io/apimachinery/pkg/util/intstr"
1718
"k8s.io/client-go/tools/record"
1819
"sigs.k8s.io/controller-runtime/pkg/reconcile"
1920

@@ -172,10 +173,10 @@ func expectedDeploymentParams() testParams {
172173
SuccessThreshold: 1,
173174
TimeoutSeconds: 5,
174175
Handler: corev1.Handler{
175-
Exec: &corev1.ExecAction{
176-
Command: []string{"bash", "-c",
177-
`curl -o /dev/null -w "%{http_code}" HTTPS://127.0.0.1:8200/ -k -s`,
178-
},
176+
HTTPGet: &corev1.HTTPGetAction{
177+
Port: intstr.FromInt(8200),
178+
Path: "/",
179+
Scheme: corev1.URISchemeHTTPS,
179180
},
180181
},
181182
},

pkg/controller/apmserver/pod.go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,19 @@
55
package apmserver
66

77
import (
8-
"fmt"
98
"path/filepath"
109
"strings"
1110

11+
corev1 "k8s.io/api/core/v1"
12+
"k8s.io/apimachinery/pkg/api/resource"
13+
"k8s.io/apimachinery/pkg/util/intstr"
14+
1215
apmv1 "github.com/elastic/cloud-on-k8s/pkg/apis/apm/v1"
1316
"github.com/elastic/cloud-on-k8s/pkg/controller/apmserver/config"
1417
"github.com/elastic/cloud-on-k8s/pkg/controller/common/container"
1518
"github.com/elastic/cloud-on-k8s/pkg/controller/common/defaults"
1619
"github.com/elastic/cloud-on-k8s/pkg/controller/common/keystore"
1720
"github.com/elastic/cloud-on-k8s/pkg/controller/common/volume"
18-
corev1 "k8s.io/api/core/v1"
19-
"k8s.io/apimachinery/pkg/api/resource"
2021
)
2122

2223
const (
@@ -54,10 +55,10 @@ func readinessProbe(tls bool) corev1.Probe {
5455
SuccessThreshold: 1,
5556
TimeoutSeconds: 5,
5657
Handler: corev1.Handler{
57-
Exec: &corev1.ExecAction{
58-
Command: []string{"bash", "-c",
59-
fmt.Sprintf(`curl -o /dev/null -w "%%{http_code}" %s://127.0.0.1:%d/ -k -s`, scheme, HTTPPort),
60-
},
58+
HTTPGet: &corev1.HTTPGetAction{
59+
Port: intstr.FromInt(HTTPPort),
60+
Path: "/",
61+
Scheme: scheme,
6162
},
6263
},
6364
}

pkg/controller/kibana/driver_test.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
"k8s.io/apimachinery/pkg/api/resource"
1818
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1919
"k8s.io/apimachinery/pkg/runtime"
20+
"k8s.io/apimachinery/pkg/util/intstr"
2021
"k8s.io/client-go/tools/record"
2122
"sigs.k8s.io/controller-runtime/pkg/client"
2223

@@ -247,7 +248,7 @@ func TestDriverDeploymentParams(t *testing.T) {
247248
params := expectedDeploymentParams()
248249
params.PodTemplateSpec.Spec.Volumes = params.PodTemplateSpec.Spec.Volumes[:3]
249250
params.PodTemplateSpec.Spec.Containers[0].VolumeMounts = params.PodTemplateSpec.Spec.Containers[0].VolumeMounts[:3]
250-
params.PodTemplateSpec.Spec.Containers[0].ReadinessProbe.Handler.Exec.Command[2] = `curl -o /dev/null -w "%{http_code}" HTTP://127.0.0.1:5601/login -k -s`
251+
params.PodTemplateSpec.Spec.Containers[0].ReadinessProbe.Handler.HTTPGet.Scheme = corev1.URISchemeHTTP
251252
params.PodTemplateSpec.Spec.Containers[0].Ports[0].Name = "http"
252253
return params
253254
}(),
@@ -514,10 +515,10 @@ func expectedDeploymentParams() deployment.Params {
514515
SuccessThreshold: 1,
515516
TimeoutSeconds: 5,
516517
Handler: corev1.Handler{
517-
Exec: &corev1.ExecAction{
518-
Command: []string{"bash", "-c",
519-
`curl -o /dev/null -w "%{http_code}" HTTPS://127.0.0.1:5601/login -k -s`,
520-
},
518+
HTTPGet: &corev1.HTTPGetAction{
519+
Port: intstr.FromInt(5601),
520+
Path: "/login",
521+
Scheme: corev1.URISchemeHTTPS,
521522
},
522523
},
523524
},

pkg/controller/kibana/pod/pod.go

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,18 @@
55
package pod
66

77
import (
8-
"fmt"
8+
kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1"
9+
corev1 "k8s.io/api/core/v1"
10+
"k8s.io/apimachinery/pkg/api/resource"
11+
"k8s.io/apimachinery/pkg/util/intstr"
912

1013
"github.com/elastic/cloud-on-k8s/pkg/controller/common/annotation"
1114
"github.com/elastic/cloud-on-k8s/pkg/controller/common/container"
12-
"k8s.io/apimachinery/pkg/api/resource"
13-
14-
kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1"
1515
"github.com/elastic/cloud-on-k8s/pkg/controller/common/defaults"
1616
"github.com/elastic/cloud-on-k8s/pkg/controller/common/keystore"
1717
"github.com/elastic/cloud-on-k8s/pkg/controller/common/pod"
1818
"github.com/elastic/cloud-on-k8s/pkg/controller/kibana/label"
1919
"github.com/elastic/cloud-on-k8s/pkg/controller/kibana/volume"
20-
21-
corev1 "k8s.io/api/core/v1"
2220
)
2321

2422
const (
@@ -56,10 +54,10 @@ func readinessProbe(useTLS bool) corev1.Probe {
5654
SuccessThreshold: 1,
5755
TimeoutSeconds: 5,
5856
Handler: corev1.Handler{
59-
Exec: &corev1.ExecAction{
60-
Command: []string{"bash", "-c",
61-
fmt.Sprintf(`curl -o /dev/null -w "%%{http_code}" %s://127.0.0.1:%d/login -k -s`, scheme, HTTPPort),
62-
},
57+
HTTPGet: &corev1.HTTPGetAction{
58+
Port: intstr.FromInt(HTTPPort),
59+
Path: "/login",
60+
Scheme: scheme,
6361
},
6462
},
6563
}

0 commit comments

Comments
 (0)