Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions 11 operator/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,17 @@ deploy-previous-via-olm: kuttl bundle-post-process ## Deploy replaced version of
.PHONY: deploy-via-installer
deploy-via-installer: ## Deploy current version of operator via distribution manifest file.
./hack/retry-kubectl.sh </dev/null apply -f dist/install.yaml
$(MAKE) babysit-deployment

.PHONY: deploy-via-chart
deploy-via-chart: ## Deploy current version of operator via helm chart produced by the chart target.
helm install --create-namespace --namespace $(TEST_NAMESPACE) rhacs-operator ./dist/chart
# It would be nice to be able to just use `--wait --set manager.env.NO_PROXY=127.1.2.3/8' rather than the below,
# but https://github.com/kubernetes-sigs/kubebuilder/issues/5485#issuecomment-3919321648 prevents that at the moment.
$(MAKE) babysit-deployment

.PHONY: babysit-deployment
babysit-deployment: ## Patch operator controller deployment as needed for the tests to pass, and wait until it's healthy.
# A hack for the NO_PROXY assertions in the e2e tests.
./hack/retry-kubectl.sh </dev/null set env -n $(TEST_NAMESPACE) deployment/rhacs-operator-controller-manager NO_PROXY=127.1.2.3/8
# Need to hardcode the deployment name here and above, since kubectl barfs on the CRDs in the manifest when working on deployment:
Expand Down
4 changes: 2 additions & 2 deletions 4 operator/tests/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ _EO_KUTTL_HELP_
fi
[[ $FAILED = 0 ]] || die "operator upgrade tests failed"
else
info "Deploying operator using manifests..."
info "Deploying operator using helm chart..."
junit_wrap deploy-operator \
"Deploy current version of the operator." \
"${kuttl_help}" \
"make" "-C" "operator" "build-installer" "deploy-via-installer" TEST_NAMESPACE="rhacs-operator-system"
"make" "-C" "operator" "chart" "deploy-via-chart" TEST_NAMESPACE="rhacs-operator-system"
fi

info "Executing operator e2e tests"
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.