public_git/kubernetes-operator
1
0
Fork 0
mirror of https://github.com/jenkinsci/kubernetes-operator.git synced 2026-10-06 08:01:12 +02:00
Code Issues Releases Wiki Activity

update to go 1.22 and operator-sdk 1.35 (#1094)

Browse Source 
Co-authored-by: brokenpip3 <brokenpip3@gmail.com>
Co-authored-by: Ansh Garhewal <me@anshdevs.in>
Co-authored-by: xmbhasin <xmbhasin@users.noreply.github.com>
This commit is contained in:
Manish Bhasin
2025-03-30 16:37:15 +02:00
committed by GitHub
co-authored by brokenpip3 Ansh Garhewal xmbhasin
parent 1ec83b9de9
commit 9c09db8031
83 changed files with 3759 additions and 3879 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/configuration/base/reconcile_test.go
-1
View File
@@ -445,7 +445,6 @@ func Test_compareEnv(t *testing.T) {
var actual []corev1.EnvVar
got := compareEnv(expected, actual)
assert.True(t, got)
})
t.Run("same", func(t *testing.T) {
pkg/configuration/base/reconciler.go
+3
View File
@@ -121,6 +121,9 @@ func (r *JenkinsBaseConfigurationReconciler) Reconcile() (reconcile.Result, jenk
}
result, err = r.ensureBaseConfiguration(jenkinsClient)
if err != nil {
return reconcile.Result{}, nil, err
}
return result, jenkinsClient, err
}
pkg/configuration/base/resources/deployment.go
+2 -2
View File
@@ -8,7 +8,7 @@ import (
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
"k8s.io/utils/ptr"
)
// NewJenkinsMasterPod builds Jenkins Master Kubernetes Pod resource.
@@ -24,7 +24,7 @@ func NewJenkinsDeployment(objectMeta metav1.ObjectMeta, jenkins *v1alpha2.Jenkin
Labels: objectMeta.Labels,
},
Spec: appsv1.DeploymentSpec{
Replicas: pointer.Int32Ptr(1),
Replicas: ptr.To(int32(1)),
Strategy: appsv1.DeploymentStrategy{Type: appsv1.RollingUpdateDeploymentStrategyType},
Template: corev1.PodTemplateSpec{
ObjectMeta: objectMeta,
pkg/configuration/base/resources/probe.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
func NewProbe(uri string, port string, scheme corev1.URIScheme, initialDelaySeconds, timeoutSeconds, failureThreshold int32) *corev1.Probe {
return &corev1.Probe{
Handler: corev1.Handler{
ProbeHandler: corev1.ProbeHandler{
HTTPGet: &corev1.HTTPGetAction{
Path: uri,
Port: intstr.FromString(port),
pkg/configuration/base/resources/random.go
+1 -1
View File
@@ -16,5 +16,5 @@ func randomString(n int) string {
}
func init() {
rand.Seed(time.Now().UnixNano())
rand.New(rand.NewSource(time.Now().UnixNano()))
}
pkg/configuration/base/resources/resources_test.go
+10 -10
View File
@@ -16,12 +16,12 @@ var jenkins = v1alpha2.Jenkins{
{
Env: []corev1.EnvVar{},
ReadinessProbe: &corev1.Probe{
Handler: corev1.Handler{
ProbeHandler: corev1.ProbeHandler{
HTTPGet: &corev1.HTTPGetAction{},
},
},
LivenessProbe: &corev1.Probe{
Handler: corev1.Handler{
ProbeHandler: corev1.ProbeHandler{
HTTPGet: &corev1.HTTPGetAction{},
},
},
@@ -118,7 +118,7 @@ func TestSetLivenessAndReadinessPath(t *testing.T) {
jenkins.Spec.Master.Containers[0].ReadinessProbe =
&corev1.Probe{
Handler: corev1.Handler{
ProbeHandler: corev1.ProbeHandler{
HTTPGet: &corev1.HTTPGetAction{
Path: "/login",
},
@@ -127,7 +127,7 @@ func TestSetLivenessAndReadinessPath(t *testing.T) {
jenkins.Spec.Master.Containers[0].LivenessProbe =
&corev1.Probe{
Handler: corev1.Handler{
ProbeHandler: corev1.ProbeHandler{
HTTPGet: &corev1.HTTPGetAction{
Path: "/login",
},
@@ -148,7 +148,7 @@ func TestSetLivenessAndReadinessPath(t *testing.T) {
jenkins.Spec.Master.Containers[0].ReadinessProbe =
&corev1.Probe{
Handler: corev1.Handler{
ProbeHandler: corev1.ProbeHandler{
HTTPGet: &corev1.HTTPGetAction{
Path: "/login",
},
@@ -157,7 +157,7 @@ func TestSetLivenessAndReadinessPath(t *testing.T) {
jenkins.Spec.Master.Containers[0].LivenessProbe =
&corev1.Probe{
Handler: corev1.Handler{
ProbeHandler: corev1.ProbeHandler{
HTTPGet: &corev1.HTTPGetAction{
Path: "/login",
},
@@ -178,7 +178,7 @@ func TestSetLivenessAndReadinessPath(t *testing.T) {
jenkins.Spec.Master.Containers[0].ReadinessProbe =
&corev1.Probe{
Handler: corev1.Handler{
ProbeHandler: corev1.ProbeHandler{
HTTPGet: &corev1.HTTPGetAction{
Path: "/jenkins/login",
},
@@ -187,7 +187,7 @@ func TestSetLivenessAndReadinessPath(t *testing.T) {
jenkins.Spec.Master.Containers[0].LivenessProbe =
&corev1.Probe{
Handler: corev1.Handler{
ProbeHandler: corev1.ProbeHandler{
HTTPGet: &corev1.HTTPGetAction{
Path: "/jenkins/login",
},
@@ -205,7 +205,7 @@ func TestSetLivenessAndReadinessPath(t *testing.T) {
jenkins.Spec.Master.Containers[0].ReadinessProbe =
&corev1.Probe{
Handler: corev1.Handler{
ProbeHandler: corev1.ProbeHandler{
HTTPGet: &corev1.HTTPGetAction{
Path: "/jenkins/login",
},
@@ -214,7 +214,7 @@ func TestSetLivenessAndReadinessPath(t *testing.T) {
jenkins.Spec.Master.Containers[0].LivenessProbe =
&corev1.Probe{
Handler: corev1.Handler{
ProbeHandler: corev1.ProbeHandler{
HTTPGet: &corev1.HTTPGetAction{
Path: "/jenkins/login",
},
pkg/configuration/base/validate.go
+1 -1
View File
@@ -11,7 +11,7 @@ import (
"github.com/jenkinsci/kubernetes-operator/pkg/constants"
"github.com/jenkinsci/kubernetes-operator/pkg/plugins"
docker "github.com/docker/distribution/reference"
docker "github.com/distribution/reference"
stackerr "github.com/pkg/errors"
corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"