diff --git a/pkg/controller/jenkins/groovy/groovy_test.go b/pkg/controller/jenkins/groovy/groovy_test.go index 3bdd20ec..b98ed34e 100644 --- a/pkg/controller/jenkins/groovy/groovy_test.go +++ b/pkg/controller/jenkins/groovy/groovy_test.go @@ -388,7 +388,7 @@ func TestGroovy_Ensure(t *testing.T) { }, Data: map[string]string{ groovyScriptName: groovyScript, - "to-ommit": "to-ommit", + "to-omit": "to-omit", }, } err := v1alpha2.SchemeBuilder.AddToScheme(scheme.Scheme) diff --git a/pkg/controller/jenkins/jenkins_controller.go b/pkg/controller/jenkins/jenkins_controller.go index ee234c22..8a21bc51 100644 --- a/pkg/controller/jenkins/jenkins_controller.go +++ b/pkg/controller/jenkins/jenkins_controller.go @@ -509,11 +509,11 @@ func setDefaultsForContainer(jenkins *v1alpha2.Jenkins, containerIndex int, logg func isResourceRequirementsNotSet(requirements corev1.ResourceRequirements) bool { _, requestCPUSet := requirements.Requests[corev1.ResourceCPU] - _, requestMemporySet := requirements.Requests[corev1.ResourceMemory] + _, requestMemorySet := requirements.Requests[corev1.ResourceMemory] _, limitCPUSet := requirements.Limits[corev1.ResourceCPU] _, limitMemorySet := requirements.Limits[corev1.ResourceMemory] - return !limitCPUSet || !limitMemorySet || !requestCPUSet || !requestMemporySet + return !limitCPUSet || !limitMemorySet || !requestCPUSet || !requestMemorySet } func basePlugins() (result []v1alpha2.Plugin) { diff --git a/pkg/controller/jenkins/plugins/plugin_test.go b/pkg/controller/jenkins/plugins/plugin_test.go index 9c91322a..34ade133 100644 --- a/pkg/controller/jenkins/plugins/plugin_test.go +++ b/pkg/controller/jenkins/plugins/plugin_test.go @@ -69,7 +69,7 @@ func TestVerifyDependencies(t *testing.T) { assert.Contains(t, got, "Plugin 'first-root-plugin:1.0.0' requires version '1.0.0' but plugin 'first-root-plugin:2.0.0' requires '2.0.0' for plugin 'first-root-plugin'") assert.Contains(t, got, "Plugin 'first-root-plugin:2.0.0' requires version '2.0.0' but plugin 'first-root-plugin:1.0.0' requires '1.0.0' for plugin 'first-root-plugin'") }) - t.Run("happy, no version collision with two sperate plugins lists", func(t *testing.T) { + t.Run("happy, no version collision with two separate plugins lists", func(t *testing.T) { basePlugins := map[Plugin][]Plugin{ Must(New("first-root-plugin:1.0.0")): { Must(New("first-plugin:0.0.1")), diff --git a/pkg/event/event.go b/pkg/event/event.go index 6e544251..138dde13 100644 --- a/pkg/event/event.go +++ b/pkg/event/event.go @@ -23,7 +23,7 @@ const ( // Type is the type of event type Type string -// Reason is the type of reason message, used in evant +// Reason is the type of reason message, used in event type Reason string // Recorder is the interface used to emit events