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

refactor(tests): reconcile_test

This commit is contained in:
Ansh Garhewal 2024-07-22 16:07:24 +05:30
parent df66c98c90
commit dd31159b12
No known key found for this signature in database
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/configuration/base/reconcile_test.go
View File

@ -445,7 +445,6 @@ func Test_compareEnv(t *testing.T) {
var actual []corev1.EnvVar var actual []corev1.EnvVar
got := compareEnv(expected, actual) got := compareEnv(expected, actual)
assert.True(t, got) assert.True(t, got)
}) })
t.Run("same", func(t *testing.T) { t.Run("same", func(t *testing.T) {

4
pkg/configuration/base/reconciler.go
View File

@ -264,7 +264,7 @@ func compareMap(expected, actual map[string]string) bool {
} }
func compareEnv(expected, actual []corev1.EnvVar) bool { func compareEnv(expected, actual []corev1.EnvVar) bool {
actualEnv := []corev1.EnvVar{} var actualEnv []corev1.EnvVar
for _, env := range actual { for _, env := range actual {
if env.Name == "KUBERNETES_PORT_443_TCP_ADDR" || env.Name == "KUBERNETES_PORT" || if env.Name == "KUBERNETES_PORT_443_TCP_ADDR" || env.Name == "KUBERNETES_PORT" ||
env.Name == "KUBERNETES_PORT_443_TCP" || env.Name == "KUBERNETES_SERVICE_HOST" { env.Name == "KUBERNETES_PORT_443_TCP" || env.Name == "KUBERNETES_SERVICE_HOST" {
@ -289,7 +289,7 @@ func CompareContainerVolumeMounts(expected corev1.Container, actual corev1.Conta
// compareVolumes returns true if Jenkins pod and Jenkins CR volumes are the same // compareVolumes returns true if Jenkins pod and Jenkins CR volumes are the same
func (r *JenkinsBaseConfigurationReconciler) compareVolumes(actualPod corev1.Pod) bool { func (r *JenkinsBaseConfigurationReconciler) compareVolumes(actualPod corev1.Pod) bool {
toCompare := []corev1.Volume{} var toCompare []corev1.Volume
for _, volume := range actualPod.Spec.Volumes { for _, volume := range actualPod.Spec.Volumes {
// filter out service account // filter out service account
if strings.HasPrefix(volume.Name, actualPod.Spec.ServiceAccountName) { if strings.HasPrefix(volume.Name, actualPod.Spec.ServiceAccountName) {