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

Merge pull request #138 from anthonydahanne/issue135_fix_misspellings 

Fix #135: couple of misspellings - Hacktoberfest
This commit is contained in:
Tomasz Sęk 2019-10-11 09:10:47 +02:00 committed by GitHub
parent 2724893901 a778f6ccd5
commit 52328a4773
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/jenkins/groovy/groovy_test.go
View File

@ -388,7 +388,7 @@ func TestGroovy_Ensure(t *testing.T) {
}, },
Data: map[string]string{ Data: map[string]string{
groovyScriptName: groovyScript, groovyScriptName: groovyScript,
"to-ommit": "to-ommit", "to-omit": "to-omit",
}, },
} }
err := v1alpha2.SchemeBuilder.AddToScheme(scheme.Scheme) err := v1alpha2.SchemeBuilder.AddToScheme(scheme.Scheme)

4
pkg/controller/jenkins/jenkins_controller.go
View File

@ -509,11 +509,11 @@ func setDefaultsForContainer(jenkins *v1alpha2.Jenkins, containerIndex int, logg
func isResourceRequirementsNotSet(requirements corev1.ResourceRequirements) bool { func isResourceRequirementsNotSet(requirements corev1.ResourceRequirements) bool {
_, requestCPUSet := requirements.Requests[corev1.ResourceCPU] _, requestCPUSet := requirements.Requests[corev1.ResourceCPU]
_, requestMemporySet := requirements.Requests[corev1.ResourceMemory] _, requestMemorySet := requirements.Requests[corev1.ResourceMemory]
_, limitCPUSet := requirements.Limits[corev1.ResourceCPU] _, limitCPUSet := requirements.Limits[corev1.ResourceCPU]
_, limitMemorySet := requirements.Limits[corev1.ResourceMemory] _, limitMemorySet := requirements.Limits[corev1.ResourceMemory]
return !limitCPUSet || !limitMemorySet || !requestCPUSet || !requestMemporySet return !limitCPUSet || !limitMemorySet || !requestCPUSet || !requestMemorySet
} }
func basePlugins() (result []v1alpha2.Plugin) { func basePlugins() (result []v1alpha2.Plugin) {

2
pkg/controller/jenkins/plugins/plugin_test.go
View File

@ -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: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'") 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{ basePlugins := map[Plugin][]Plugin{
Must(New("first-root-plugin:1.0.0")): { Must(New("first-root-plugin:1.0.0")): {
Must(New("first-plugin:0.0.1")), Must(New("first-plugin:0.0.1")),

2
pkg/event/event.go
View File

@ -23,7 +23,7 @@ const (
// Type is the type of event // Type is the type of event
type Type string 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 type Reason string
// Recorder is the interface used to emit events // Recorder is the interface used to emit events