-
Notifications
You must be signed in to change notification settings - Fork 153
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
Introducing kustomize for HCO deployment #463
Conversation
orenc1
commented
Feb 19, 2020
•
edited
Loading
edited
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you please rebase this on master and squash in a single commit?
There should be only one entry point to deploy the project. You should explain the benefit of kustomize. I don't think there is any point of keeping the existing code - let me know if I am wrong. |
|
||
main() { | ||
SCRIPT_DIR="$(dirname "$0")" | ||
TARGET_NAMESPACE=$(grep name: $SCRIPT_DIR/namespace.yaml | awk '{print $2}') |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The other option is to take theTARGET_NAMESPACE
argument (or environment variable) and simply write out the namespace.yaml
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All of the manifests and deploy_kustomize.sh
script look good to me. As far as the README is concerned, you should at least communicate how these manifests would be consumed without the shell script.
deploy/kustomize/README.md
Outdated
@@ -0,0 +1,44 @@ | |||
# Intro |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I recommend making the header something like "Kustomize Manifests" and simply describe this directory as manifests for delivering and deploying the HCO via OLM using Kustomize.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Instead of having the "Deploy Modes" as you do below. I recommend that here, you mention that there are two necessary steps to install HCO via OLM in a cluster 1) "delivery" - make OLM aware of HCO and 2) "deploy" - use OLM provided APIs to install HCO.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My bad for missing this comment the last round of review, other than the directory structure being included in the readme this LGTM.
deploy/kustomize/README.md
Outdated
1. **Delivery** - Make HCO recognized and available for the operator-lifecycle-manager (OLM). | ||
2. **Deployment** - Use OLM provided resources and APIs to deploy HCO on the cluster. | ||
|
||
## Directory Tree |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To keep from needing to update this readme anytime we modify this directory, let's just drop the directory tree.
/test hco-e2e-aws |
/approve |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: tiraboschi The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
ci/prow/hco-e2e-upgrade-aws currently runs on OCP 4.5 and it's going to fail due to a side effect in the fix of https://bugzilla.redhat.com/1825330 |
@tiraboschi: Overrode contexts on behalf of tiraboschi: ci/prow/hco-e2e-upgrade-aws In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
/test hco-e2e-aws |
Intended to replace deploy_marketplace.sh and deploy_imageregistry.sh scripts. Deployment can be done by two ways: 1. Export relevant env vars, then run the "deploy_kustomize.sh" script using either "marketplace" or "image_registry" arguments. 2. Edit the relevant manifests, then run the overlay for the required HCO deployment combination. Signed-off-by: orenc1 <[email protected]>
… make hco available and install hco, moving quay token and retry_loop functions to different files Signed-off-by: orenc1 <[email protected]>
…ace change using patches, update README file. Signed-off-by: orenc1 <[email protected]>
… resources. Signed-off-by: orenc1 <[email protected]>
Signed-off-by: orenc1 <[email protected]>
Signed-off-by: orenc1 <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
/test images Based on #463 (comment) /override ci/prow/hco-e2e-upgrade-aws |
@djzager: Overrode contexts on behalf of djzager: ci/prow/hco-e2e-upgrade-aws In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
@orenc1: The following test failed, say
Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
/test images |
} | ||
|
||
# Deploy HCO and OLM Resources with retries | ||
retry_loop() { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@dankenigsberg just FYI - this is a retryloop we need to mitigae the not-auto-create-cr
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I'm aware of it. If we auto-create, users with default requirements could avoid this retry_loop. But we cannot avoid in code if we want to support user kustomization of the HCO.cr. We currently have nothing there, but sooner or later, we would.