Skip to content

Commit

Permalink
Merge pull request #334 from superbrothers/fix-typo
Browse files Browse the repository at this point in the history
Fix typo for "Controller"
  • Loading branch information
k8s-ci-robot authored Jul 27, 2018
2 parents b1c1234 + 7524c7b commit b1242ed
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion docs/book/SUMMARY.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* [What is a Resource](basics/what_is_a_resource.md)
* [Resource Example](basics/simple_resource.md)
* Controllers
* [What is a Contoller](basics/what_is_a_controller.md)
* [What is a Controller](basics/what_is_a_controller.md)
* [Controller Example](basics/simple_controller.md)
* Managers
* [What is the Manager](basics/what_is_the_controller_manager.md)
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/e2e_v0.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ var _ = Describe("v0 main workflow", func() {
Expect(err).NotTo(HaveOccurred())

By("validate the controller-manager pod running as expected")
verifyContollerUp := func() error {
verifyControllerUp := func() error {
// Get pod name
// TODO: Use kubectl to format the output with a go-template
getOptions := []string{"get", "pods", "-n", c.namespace, "-l", "control-plane=controller-manager", "-o", "go-template={{ range .items }}{{ if not .metadata.deletionTimestamp }}{{ .metadata.name }}{{ \"\\n\" }}{{ end }}{{ end }}"}
Expand All @@ -104,7 +104,7 @@ var _ = Describe("v0 main workflow", func() {

return nil
}
Eventually(verifyContollerUp, 1*time.Minute, 500*time.Millisecond).Should(BeNil())
Eventually(verifyControllerUp, 1*time.Minute, 500*time.Millisecond).Should(BeNil())

By("creating resource object")
inputFile = filepath.Join(kubebuilderTest.Dir, "hack", "sample", strings.ToLower(c.kind)+".yaml")
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/e2e_v1.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ var _ = Describe("v1 main workflow", func() {
err = kubebuilderTest.Make(makeDeployOptions)

By("validate the controller-manager pod running as expected")
verifyContollerUp := func() error {
verifyControllerUp := func() error {
// Get pod name
getOptions := []string{"get", "pods", "-l", "control-plane=controller-manager", "-n", fmt.Sprintf("e2e-%s-system", testSuffix), "-o", "go-template={{ range .items }}{{ if not .metadata.deletionTimestamp }}{{ .metadata.name }}{{ \"\\n\" }}{{ end }}{{ end }}"}
podOutput, err := kubebuilderTest.RunKubectlCommand(framework.GetKubectlArgs(getOptions))
Expand All @@ -119,7 +119,7 @@ var _ = Describe("v1 main workflow", func() {

return nil
}
Eventually(verifyContollerUp, 5*time.Minute, time.Second).Should(BeNil())
Eventually(verifyControllerUp, 5*time.Minute, time.Second).Should(BeNil())

By("creating an instance of CR")
inputFile := filepath.Join("config", "samples", fmt.Sprintf("%s_%s_%s.yaml", c.group, c.version, strings.ToLower(c.kind)))
Expand Down

0 comments on commit b1242ed

Please sign in to comment.