public_git
/
kubernetes-operator
mirror of https://github.com/jenkinsci/kubernetes-operator.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix probe handler

This commit is contained in:
brokenpip3 2024-02-25 00:18:08 +01:00
parent 7f4e3bceae
commit 549930bcd6
No known key found for this signature in database
GPG Key ID: 1D9BDC803797B4B6
8 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/v1alpha2/zz_generated.deepcopy.go
View File

@ -1,3 +1,4 @@
//go:build !ignore_autogenerated
// +build !ignore_autogenerated // +build !ignore_autogenerated
/* /*

2
pkg/configuration/base/resources/probe.go
View File

@ -7,7 +7,7 @@ import (
func NewProbe(uri string, port string, scheme corev1.URIScheme, initialDelaySeconds, timeoutSeconds, failureThreshold int32) *corev1.Probe { func NewProbe(uri string, port string, scheme corev1.URIScheme, initialDelaySeconds, timeoutSeconds, failureThreshold int32) *corev1.Probe {
return &corev1.Probe{ return &corev1.Probe{
Handler: corev1.Handler{ ProbeHandler: corev1.ProbeHandler{
HTTPGet: &corev1.HTTPGetAction{ HTTPGet: &corev1.HTTPGetAction{
Path: uri, Path: uri,
Port: intstr.FromString(port), Port: intstr.FromString(port),

20
pkg/configuration/base/resources/resources_test.go
View File

@ -16,12 +16,12 @@ var jenkins = v1alpha2.Jenkins{
{ {
Env: []corev1.EnvVar{}, Env: []corev1.EnvVar{},
ReadinessProbe: &corev1.Probe{ ReadinessProbe: &corev1.Probe{
Handler: corev1.Handler{ ProbeHandler: corev1.ProbeHandler{
HTTPGet: &corev1.HTTPGetAction{}, HTTPGet: &corev1.HTTPGetAction{},
}, },
}, },
LivenessProbe: &corev1.Probe{ LivenessProbe: &corev1.Probe{
Handler: corev1.Handler{ ProbeHandler: corev1.ProbeHandler{
HTTPGet: &corev1.HTTPGetAction{}, HTTPGet: &corev1.HTTPGetAction{},
}, },
}, },
@ -118,7 +118,7 @@ func TestSetLivenessAndReadinessPath(t *testing.T) {
jenkins.Spec.Master.Containers[0].ReadinessProbe = jenkins.Spec.Master.Containers[0].ReadinessProbe =
&corev1.Probe{ &corev1.Probe{
Handler: corev1.Handler{ ProbeHandler: corev1.ProbeHandler{
HTTPGet: &corev1.HTTPGetAction{ HTTPGet: &corev1.HTTPGetAction{
Path: "/login", Path: "/login",
}, },
@ -127,7 +127,7 @@ func TestSetLivenessAndReadinessPath(t *testing.T) {
jenkins.Spec.Master.Containers[0].LivenessProbe = jenkins.Spec.Master.Containers[0].LivenessProbe =
&corev1.Probe{ &corev1.Probe{
Handler: corev1.Handler{ ProbeHandler: corev1.ProbeHandler{
HTTPGet: &corev1.HTTPGetAction{ HTTPGet: &corev1.HTTPGetAction{
Path: "/login", Path: "/login",
}, },
@ -148,7 +148,7 @@ func TestSetLivenessAndReadinessPath(t *testing.T) {
jenkins.Spec.Master.Containers[0].ReadinessProbe = jenkins.Spec.Master.Containers[0].ReadinessProbe =
&corev1.Probe{ &corev1.Probe{
Handler: corev1.Handler{ ProbeHandler: corev1.ProbeHandler{
HTTPGet: &corev1.HTTPGetAction{ HTTPGet: &corev1.HTTPGetAction{
Path: "/login", Path: "/login",
}, },
@ -157,7 +157,7 @@ func TestSetLivenessAndReadinessPath(t *testing.T) {
jenkins.Spec.Master.Containers[0].LivenessProbe = jenkins.Spec.Master.Containers[0].LivenessProbe =
&corev1.Probe{ &corev1.Probe{
Handler: corev1.Handler{ ProbeHandler: corev1.ProbeHandler{
HTTPGet: &corev1.HTTPGetAction{ HTTPGet: &corev1.HTTPGetAction{
Path: "/login", Path: "/login",
}, },
@ -178,7 +178,7 @@ func TestSetLivenessAndReadinessPath(t *testing.T) {
jenkins.Spec.Master.Containers[0].ReadinessProbe = jenkins.Spec.Master.Containers[0].ReadinessProbe =
&corev1.Probe{ &corev1.Probe{
Handler: corev1.Handler{ ProbeHandler: corev1.ProbeHandler{
HTTPGet: &corev1.HTTPGetAction{ HTTPGet: &corev1.HTTPGetAction{
Path: "/jenkins/login", Path: "/jenkins/login",
}, },
@ -187,7 +187,7 @@ func TestSetLivenessAndReadinessPath(t *testing.T) {
jenkins.Spec.Master.Containers[0].LivenessProbe = jenkins.Spec.Master.Containers[0].LivenessProbe =
&corev1.Probe{ &corev1.Probe{
Handler: corev1.Handler{ ProbeHandler: corev1.ProbeHandler{
HTTPGet: &corev1.HTTPGetAction{ HTTPGet: &corev1.HTTPGetAction{
Path: "/jenkins/login", Path: "/jenkins/login",
}, },
@ -205,7 +205,7 @@ func TestSetLivenessAndReadinessPath(t *testing.T) {
jenkins.Spec.Master.Containers[0].ReadinessProbe = jenkins.Spec.Master.Containers[0].ReadinessProbe =
&corev1.Probe{ &corev1.Probe{
Handler: corev1.Handler{ ProbeHandler: corev1.ProbeHandler{
HTTPGet: &corev1.HTTPGetAction{ HTTPGet: &corev1.HTTPGetAction{
Path: "/jenkins/login", Path: "/jenkins/login",
}, },
@ -214,7 +214,7 @@ func TestSetLivenessAndReadinessPath(t *testing.T) {
jenkins.Spec.Master.Containers[0].LivenessProbe = jenkins.Spec.Master.Containers[0].LivenessProbe =
&corev1.Probe{ &corev1.Probe{
Handler: corev1.Handler{ ProbeHandler: corev1.ProbeHandler{
HTTPGet: &corev1.HTTPGetAction{ HTTPGet: &corev1.HTTPGetAction{
Path: "/jenkins/login", Path: "/jenkins/login",
}, },

27
pkg/notifications/smtp/smtp_test.go
View File

@ -2,10 +2,9 @@ package smtp
import ( import (
"context" "context"
"errors" //"errors"
"fmt" "fmt"
"io" "io"
"io/ioutil"
"mime/quotedprintable" "mime/quotedprintable"
"net" "net"
"regexp" "regexp"
@ -57,18 +56,18 @@ type testServer struct {
event event.Event event event.Event
} }
// Login handles a login command with username and password. // TODO: @brokenpip3 fix me
func (bkd *testServer) Login(_ *smtp.ConnectionState, username, password string) (smtp.Session, error) { //func (bkd *testServer) Login(_ *smtp.ConnectionState, username, password string) (smtp.Session, error) {
if username != testSMTPUsername || password != testSMTPPassword { // if username != testSMTPUsername || password != testSMTPPassword {
return nil, errors.New("invalid username or password") // return nil, errors.New("invalid username or password")
} // }
return &testSession{event: bkd.event}, nil // return &testSession{event: bkd.event}, nil
} //}
//
// AnonymousLogin requires clients to authenticate using SMTP AUTH before sending emails //// AnonymousLogin requires clients to authenticate using SMTP AUTH before sending emails
func (bkd *testServer) AnonymousLogin(_ *smtp.ConnectionState) (smtp.Session, error) { //func (bkd *testServer) AnonymousLogin(_ *smtp.ConnectionState) (smtp.Session, error) {
return nil, smtp.ErrAuthRequired // return nil, smtp.ErrAuthRequired
} //}
// A Session is returned after successful login. // A Session is returned after successful login.
type testSession struct { type testSession struct {

8
test/e2e/jenkins_test.go
View File

@ -75,7 +75,7 @@ func createJenkinsCRSafeRestart(name, namespace string, seedJob *[]v1alpha2.Seed
}, },
}, },
ReadinessProbe: &corev1.Probe{ ReadinessProbe: &corev1.Probe{
Handler: corev1.Handler{ ProbeHandler: corev1.ProbeHandler{
HTTPGet: &corev1.HTTPGetAction{ HTTPGet: &corev1.HTTPGetAction{
Path: "/login", Path: "/login",
Port: intstr.FromString("http"), Port: intstr.FromString("http"),
@ -89,7 +89,7 @@ func createJenkinsCRSafeRestart(name, namespace string, seedJob *[]v1alpha2.Seed
PeriodSeconds: int32(10), PeriodSeconds: int32(10),
}, },
LivenessProbe: &corev1.Probe{ LivenessProbe: &corev1.Probe{
Handler: corev1.Handler{ ProbeHandler: corev1.ProbeHandler{
HTTPGet: &corev1.HTTPGetAction{ HTTPGet: &corev1.HTTPGetAction{
Path: "/login", Path: "/login",
Port: intstr.FromString("http"), Port: intstr.FromString("http"),
@ -143,8 +143,8 @@ func createJenkinsCRSafeRestart(name, namespace string, seedJob *[]v1alpha2.Seed
}, },
SeedJobs: seedJobs, SeedJobs: seedJobs,
Service: v1alpha2.Service{ Service: v1alpha2.Service{
Type: corev1.ServiceTypeNodePort, Type: corev1.ServiceTypeNodePort,
Port: constants.DefaultHTTPPortInt32, Port: constants.DefaultHTTPPortInt32,
NodePort: 30303, NodePort: 30303,
}, },
}, },

8
test/e2e/restorebackup_test.go
View File

@ -117,7 +117,7 @@ func createJenkinsWithBackupAndRestoreConfigured(name, namespace string) *v1alph
}, },
}, },
ReadinessProbe: &corev1.Probe{ ReadinessProbe: &corev1.Probe{
Handler: corev1.Handler{ ProbeHandler: corev1.ProbeHandler{
HTTPGet: &corev1.HTTPGetAction{ HTTPGet: &corev1.HTTPGetAction{
Path: "/login", Path: "/login",
Port: intstr.FromString("http"), Port: intstr.FromString("http"),
@ -131,7 +131,7 @@ func createJenkinsWithBackupAndRestoreConfigured(name, namespace string) *v1alph
PeriodSeconds: int32(5), PeriodSeconds: int32(5),
}, },
LivenessProbe: &corev1.Probe{ LivenessProbe: &corev1.Probe{
Handler: corev1.Handler{ ProbeHandler: corev1.ProbeHandler{
HTTPGet: &corev1.HTTPGetAction{ HTTPGet: &corev1.HTTPGetAction{
Path: "/login", Path: "/login",
Port: intstr.FromString("http"), Port: intstr.FromString("http"),
@ -210,8 +210,8 @@ func createJenkinsWithBackupAndRestoreConfigured(name, namespace string) *v1alph
}, },
}, },
Service: v1alpha2.Service{ Service: v1alpha2.Service{
Type: corev1.ServiceTypeNodePort, Type: corev1.ServiceTypeNodePort,
Port: constants.DefaultHTTPPortInt32, Port: constants.DefaultHTTPPortInt32,
NodePort: 30303, NodePort: 30303,
}, },
}, },

8
test/e2e/test_utility.go
View File

@ -97,7 +97,7 @@ func RenderJenkinsCR(name, namespace string, seedJob *[]v1alpha2.SeedJob, groovy
}, },
}, },
ReadinessProbe: &corev1.Probe{ ReadinessProbe: &corev1.Probe{
Handler: corev1.Handler{ ProbeHandler: corev1.ProbeHandler{
HTTPGet: &corev1.HTTPGetAction{ HTTPGet: &corev1.HTTPGetAction{
Path: "/login", Path: "/login",
Port: intstr.FromString("http"), Port: intstr.FromString("http"),
@ -111,7 +111,7 @@ func RenderJenkinsCR(name, namespace string, seedJob *[]v1alpha2.SeedJob, groovy
PeriodSeconds: int32(1), PeriodSeconds: int32(1),
}, },
LivenessProbe: &corev1.Probe{ LivenessProbe: &corev1.Probe{
Handler: corev1.Handler{ ProbeHandler: corev1.ProbeHandler{
HTTPGet: &corev1.HTTPGetAction{ HTTPGet: &corev1.HTTPGetAction{
Path: "/login", Path: "/login",
Port: intstr.FromString("http"), Port: intstr.FromString("http"),
@ -165,8 +165,8 @@ func RenderJenkinsCR(name, namespace string, seedJob *[]v1alpha2.SeedJob, groovy
}, },
SeedJobs: seedJobs, SeedJobs: seedJobs,
Service: v1alpha2.Service{ Service: v1alpha2.Service{
Type: corev1.ServiceTypeNodePort, Type: corev1.ServiceTypeNodePort,
Port: constants.DefaultHTTPPortInt32, Port: constants.DefaultHTTPPortInt32,
NodePort: 30303, NodePort: 30303,
}, },
Roles: []rbacv1.RoleRef{ Roles: []rbacv1.RoleRef{

2
test/helm/suite_test.go
View File

@ -43,7 +43,7 @@ var _ = BeforeSuite(func(done Done) {
var err error var err error
// cfg is defined in this file globally. // cfg is defined in this file globally.
cfg, err = testEnv.Start() cfg, err := testEnv.Start()
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
Expect(cfg).NotTo(BeNil()) Expect(cfg).NotTo(BeNil())