feat: operator distribution manifest #18442
Draft
Conversation
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
|
Skipping CI for Draft Pull Request. |
Contributor
Author
|
/test gke-operator-e2e-tests |
Contributor
Author
|
/test ? |
|
@porridge: The following commands are available to trigger required jobs: The following commands are available to trigger optional jobs: Use DetailsIn 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-sigs/prow repository. |
Contributor
Author
|
/test ocp-4-20-operator-e2e-tests |
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Hey - I've found 1 issue, and left some high level feedback:
- In
operator/tests/run.sh, consider validatingoperator_cluster_typeagainst the supported values (e.g.,openshift4, others) and failing fast on unknown/empty values so typos or missing arguments don’t silently change the deployment path. - The
distMake target uses asedsubstitution on the kustomize output to set the image tag; using kustomize’s built-in image override mechanisms instead would be less brittle than relying on a specific:0.0.1pattern in the rendered YAML.
Prompt for AI Agents
Please address the comments from this code review:
## Overall Comments
- In `operator/tests/run.sh`, consider validating `operator_cluster_type` against the supported values (e.g., `openshift4`, others) and failing fast on unknown/empty values so typos or missing arguments don’t silently change the deployment path.
- The `dist` Make target uses a `sed` substitution on the kustomize output to set the image tag; using kustomize’s built-in image override mechanisms instead would be less brittle than relying on a specific `:0.0.1` pattern in the rendered YAML.
## Individual Comments
### Comment 1
<location> `operator/Makefile:412-413` </location>
<code_context>
upgrade-dirty-tag-via-olm: kuttl
KUTTL=$(KUTTL) PATH="$(PROJECT_DIR)/hack:$${PATH}" ./hack/olm-operator-upgrade.sh --allow-dirty-tag $(TEST_NAMESPACE) $(INSTALL_VERSION)
+.PHONY: deploy-via-dist
+deploy-via-dist: ## Deploy current version of operator via distribution manifest file.
+ ./hack/retry-kubectl.sh </dev/null apply -f dist.yaml
+ ./hack/retry-kubectl.sh </dev/null rollout status deployment rhacs-operator-controller-manager -n rhacs-operator-system --timeout=300s
+
##@ Bundle and Index build
</code_context>
<issue_to_address>
**suggestion:** Consider making `deploy-via-dist` depend on `dist` so `dist.yaml` is always generated before applying.
`deploy-via-dist` currently assumes `dist.yaml` already exists. Making it depend on the `dist` target (e.g., `deploy-via-dist: dist`) ensures the manifest is regenerated with the current `VERSION` and avoids failures from a stale or missing file.
```suggestion
.PHONY: deploy-via-dist
deploy-via-dist: dist ## Deploy current version of operator via distribution manifest file.
```
</issue_to_address>Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
Comment on lines
+412
to
+413
| .PHONY: deploy-via-dist | ||
| deploy-via-dist: ## Deploy current version of operator via distribution manifest file. |
Contributor
There was a problem hiding this comment.
suggestion: Consider making deploy-via-dist depend on dist so dist.yaml is always generated before applying.
deploy-via-dist currently assumes dist.yaml already exists. Making it depend on the dist target (e.g., deploy-via-dist: dist) ensures the manifest is regenerated with the current VERSION and avoids failures from a stale or missing file.
Suggested change
| .PHONY: deploy-via-dist | |
| deploy-via-dist: ## Deploy current version of operator via distribution manifest file. | |
| .PHONY: deploy-via-dist | |
| deploy-via-dist: dist ## Deploy current version of operator via distribution manifest file. |
Contributor
|
Images are ready for the commit at b694f78. To use with deploy scripts, first |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #18442 +/- ##
=======================================
Coverage 48.93% 48.93%
=======================================
Files 2631 2631
Lines 197964 197964
=======================================
+ Hits 96872 96878 +6
+ Misses 93703 93701 -2
+ Partials 7389 7385 -4
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
|
@porridge: The following tests failed, say
Full PR test history. Your PR dashboard. DetailsInstructions 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-sigs/prow repository. I understand the commands that are listed here. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Description
change me!
User-facing documentation
Testing and quality
Automated testing
How I validated my change
change me!