-
Notifications
You must be signed in to change notification settings - Fork 1.8k
test,hack: add e2e test for new project layout #3060
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| # remove running containers on exit | ||
| function cleanup() { | ||
| kind delete cluster | ||
| } | ||
|
|
||
| set -o errexit | ||
| set -o nounset | ||
| set -o pipefail | ||
|
|
||
| source ./hack/lib/common.sh | ||
| source ./hack/lib/test_lib.sh | ||
|
|
||
| test_dir=./test | ||
| tests=$test_dir/e2e-new | ||
|
|
||
| export TRACE=1 | ||
| export GO111MODULE=on | ||
|
|
||
| : ${K8S_VERSION:?"must be set"} | ||
|
|
||
| prepare_staging_dir $tmp_sdk_root | ||
| fetch_tools $tmp_sdk_root | ||
| # These envtest environment variables are required for the default unit tests | ||
| # scaffolded in the test operator project. No e2e tests currently use envtest. | ||
| setup_envs $tmp_sdk_root | ||
estroz marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| build_sdk $tmp_sdk_root | ||
|
|
||
| # Create a cluster of version $K8S_VERSION. | ||
| kind create cluster -v 4 --retain --wait=1m \ | ||
| --config $test_dir/kind-config.yaml \ | ||
| --image=kindest/node:$K8S_VERSION | ||
|
|
||
| kind export kubeconfig | ||
|
|
||
| kubectl cluster-info | ||
|
|
||
| docker pull gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0 | ||
| kind load docker-image gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0 | ||
|
|
||
| trap_add cleanup EXIT | ||
| go test -v $tests | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| // Copyright 2020 The Operator-SDK Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| // Modified from https://github.com/kubernetes-sigs/kubebuilder/tree/39224f0/test/e2e/v3 | ||
|
|
||
| package e2e | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "path/filepath" | ||
| "strings" | ||
| "time" | ||
|
|
||
| . "github.com/onsi/ginkgo" //nolint:golint | ||
| . "github.com/onsi/gomega" //nolint:golint | ||
|
|
||
| "github.com/operator-framework/operator-sdk/test/e2e-new/utils" | ||
| ) | ||
|
|
||
| var _ = Describe("operator-sdk", func() { | ||
| Context("with the new project layout", func() { | ||
| var tc *utils.TestContext | ||
| BeforeEach(func() { | ||
|
|
||
| By("creating a new test context") | ||
| var err error | ||
| tc, err = utils.NewTestContext("operator-sdk", "GO111MODULE=on") | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| Expect(tc.Prepare()).To(Succeed()) | ||
| }) | ||
|
|
||
| AfterEach(func() { | ||
| By("cleaning up created API objects during test process") | ||
| tc.CleanupManifests(filepath.Join("config", "default")) | ||
|
|
||
| By("removing container image and work dir") | ||
| tc.Destroy() | ||
| }) | ||
|
|
||
| It("should generate a runnable project", func() { | ||
| var controllerPodName string | ||
| By("initializing a project") | ||
| err := tc.Init( | ||
| "--project-version", "3-alpha", | ||
| "--domain", tc.Domain, | ||
| "--fetch-deps=false") | ||
| Expect(err).Should(Succeed()) | ||
|
|
||
| By("creating an API definition") | ||
| err = tc.CreateAPI( | ||
| "--group", tc.Group, | ||
| "--version", tc.Version, | ||
| "--kind", tc.Kind, | ||
| "--namespaced", | ||
| "--resource", | ||
| "--controller", | ||
| "--make=false") | ||
| Expect(err).Should(Succeed()) | ||
|
|
||
| By("implementing the API") | ||
| Expect(utils.InsertCode( | ||
| filepath.Join(tc.Dir, "api", tc.Version, fmt.Sprintf("%s_types.go", strings.ToLower(tc.Kind))), | ||
| fmt.Sprintf(`type %sSpec struct { | ||
| `, tc.Kind), | ||
| ` // +optional | ||
| Count int `+"`"+`json:"count,omitempty"`+"`"+` | ||
| `)).Should(Succeed()) | ||
|
|
||
| By("building the operator image") | ||
| err = tc.Make("docker-build", "IMG="+tc.ImageName) | ||
| Expect(err).Should(Succeed()) | ||
|
|
||
| By("loading the operator image into the test cluster") | ||
| err = tc.LoadImageToKindCluster() | ||
| Expect(err).Should(Succeed()) | ||
|
|
||
| By("deploying the controller manager") | ||
| err = tc.Make("deploy", "IMG="+tc.ImageName) | ||
| Expect(err).Should(Succeed()) | ||
|
|
||
| By("ensuring the controller-manager pod is running as expected") | ||
| verifyControllerUp := func() error { | ||
| // Get pod name | ||
| podOutput, err := tc.Kubectl.Get( | ||
| true, | ||
| "pods", "-l", "control-plane=controller-manager", | ||
| "-o", "go-template={{ range .items }}{{ if not .metadata.deletionTimestamp }}{{ .metadata.name }}"+ | ||
| "{{ \"\\n\" }}{{ end }}{{ end }}") | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| podNames := utils.GetNonEmptyLines(podOutput) | ||
| if len(podNames) != 1 { | ||
| return fmt.Errorf("expect 1 controller pods running, but got %d", len(podNames)) | ||
| } | ||
| controllerPodName = podNames[0] | ||
| Expect(controllerPodName).Should(ContainSubstring("controller-manager")) | ||
|
|
||
| // Validate pod status | ||
| status, err := tc.Kubectl.Get( | ||
| true, | ||
| "pods", controllerPodName, "-o", "jsonpath={.status.phase}") | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| if status != "Running" { | ||
| return fmt.Errorf("controller pod in %s status", status) | ||
| } | ||
| return nil | ||
| } | ||
| Eventually(verifyControllerUp, time.Minute, time.Second).Should(Succeed()) | ||
|
|
||
| By("creating an instance of CR") | ||
| // currently controller-runtime doesn't provide a readiness probe, we retry a few times | ||
| // we can change it to probe the readiness endpoint after CR supports it. | ||
| sampleFile := filepath.Join("config", "samples", | ||
| fmt.Sprintf("%s_%s_%s.yaml", tc.Group, tc.Version, strings.ToLower(tc.Kind))) | ||
| Eventually(func() error { | ||
| _, err = tc.Kubectl.Apply(true, "-f", sampleFile) | ||
| return err | ||
| }, time.Minute, time.Second).Should(Succeed()) | ||
|
|
||
| By("ensuring the created resource object gets reconciled in controller") | ||
| managerContainerLogs := func() string { | ||
| logOutput, err := tc.Kubectl.Logs(controllerPodName, "-c", "manager") | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| return logOutput | ||
| } | ||
| Eventually(managerContainerLogs, time.Minute, time.Second).Should(ContainSubstring("Successfully Reconciled")) | ||
| }) | ||
| }) | ||
| }) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.