Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Expose new custom components env vars to csv-generator and manifest-templator #8792

Merged
merged 5 commits into from
Nov 17, 2022
Merged

Expose new custom components env vars to csv-generator and manifest-templator #8792

merged 5 commits into from
Nov 17, 2022

Conversation

iholder101
Copy link
Contributor

What this PR does / why we need it:
This is a follow-up for #8673. This PR aims to expose the new env vars introduced in the previous PR to csv-generator and manifest-templator.

Release note:

Expose new custom components env vars to csv-generator and manifest-templator

@kubevirt-bot kubevirt-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. size/L labels Nov 15, 2022
@iholder101
Copy link
Contributor Author

iholder101 commented Nov 15, 2022 •
edited
Loading

/cc @jean-edouard @enp0s3 @fossedihelm

Can you please pay special attention to bc513a7?
Some context: currently, for some reason, it is allowed to provide either all of the custom sha env vars or none of them. This is a very old code and I guess this restriction isn't necessary. Am I missing anything?

@iholder101 iholder101 force-pushed the feature/CuztomComponentsCsvGeneratorManifestTemplator branch from 25a82b6 to 06e9722 Compare November 15, 2022 16:10
@iholder101
Expose new custom components env vars to csv-generator and manifest-t…
1109b00 
…emplator

Signed-off-by: Itamar Holder <[email protected]>
@iholder101
Favor new full-image env vars over deprecated sha vars
ed4f8c8 
Signed-off-by: Itamar Holder <[email protected]>
@iholder101
Add deprecation message for deprecated env variables
949f2e8 
Signed-off-by: Itamar Holder <[email protected]>
@iholder101
Relax VerifyEnv(): allow some images to be replaced
db701ac 
Until this commit, the following rules were enforced:
1. virt-operator image has to be found
2. virt-operator image needs to comply with the virt-operator regex
3. If one custom component is set, all need to be set

Rules 2 and 3 are now dropped, which essentially means:
* Any custom image can be given, not only one that complies with
  virt-operator regex
* Custom images can be applied to SOME of the components but not all

Signed-off-by: Itamar Holder <[email protected]>
@iholder101
Adjust unit tests
aff9581 
Signed-off-by: Itamar Holder <[email protected]>
@iholder101 iholder101 force-pushed the feature/CuztomComponentsCsvGeneratorManifestTemplator branch from 06e9722 to aff9581 Compare November 15, 2022 16:52
jean-edouard
jean-edouard reviewed Nov 15, 2022
View reviewed changes
Copy link
Contributor

@jean-edouard jean-edouard left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve

@kubevirt-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jean-edouard

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubevirt-bot kubevirt-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 15, 2022
fossedihelm
fossedihelm approved these changes Nov 15, 2022
View reviewed changes
Copy link
Contributor

@fossedihelm fossedihelm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

@kubevirt-bot kubevirt-bot added the lgtm Indicates that a PR is ready to be merged. label Nov 15, 2022
@fossedihelm
Copy link
Contributor

/retest-required

1 similar comment
@fossedihelm
Copy link
Contributor

/retest-required

@kubevirt-bot kubevirt-bot merged commit 9574817 into kubevirt:main Nov 17, 2022
@iholder101
Copy link
Contributor Author

/cherrypick release-0.58

@kubevirt-bot
Copy link
Contributor

@iholder-redhat: #8792 failed to apply on top of branch "release-0.58":

Applying: Expose new custom components env vars to csv-generator and manifest-templator
Using index info to reconstruct a base tree...
M	manifests/generated/operator-csv.yaml.in
M	pkg/virt-operator/resource/generate/components/deployments.go
M	pkg/virt-operator/resource/generate/csv/csv.go
M	tools/csv-generator/csv-generator.go
M	tools/manifest-templator/manifest-templator.go
Falling back to patching base and 3-way merge...
Auto-merging tools/manifest-templator/manifest-templator.go
CONFLICT (content): Merge conflict in tools/manifest-templator/manifest-templator.go
Auto-merging tools/csv-generator/csv-generator.go
CONFLICT (content): Merge conflict in tools/csv-generator/csv-generator.go
Auto-merging pkg/virt-operator/resource/generate/csv/csv.go
CONFLICT (content): Merge conflict in pkg/virt-operator/resource/generate/csv/csv.go
Auto-merging pkg/virt-operator/resource/generate/components/deployments.go
CONFLICT (content): Merge conflict in pkg/virt-operator/resource/generate/components/deployments.go
Auto-merging manifests/generated/operator-csv.yaml.in
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Expose new custom components env vars to csv-generator and manifest-templator
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-0.58

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.

This was referenced Nov 18, 2022
Merged
Merged
orenc1
orenc1 reviewed Nov 21, 2022
View reviewed changes
tools/manifest-templator/manifest-templator.go
@@ -41,6 +41,11 @@ import (
"kubevirt.io/kubevirt/tools/util"
)

const (
customImageExample = "Examples: some.registry.com@sha256:abcdefghijklmnop, other.registry.com:tag1"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

abcdefghijklmnop is not a valid example for sha digest as it should include only hexadecimal characters (0-9,a-f) :)

@iholder101 iholder101 mentioned this pull request Dec 1, 2022
Merged
@iholder101 iholder101 mentioned this pull request Jan 9, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@orenc1 orenc1 orenc1 left review comments

@jean-edouard jean-edouard jean-edouard left review comments

@fossedihelm fossedihelm fossedihelm approved these changes

@enp0s3 enp0s3 Awaiting requested review from enp0s3

@rthallisey rthallisey Awaiting requested review from rthallisey

Assignees

@fossedihelm fossedihelm

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@iholder101 @kubevirt-bot @fossedihelm @jean-edouard @orenc1