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.

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

Import master into stable-1.5 #149

Merged
merged 17 commits into from
Oct 27, 2023
Merged

Import master into stable-1.5 #149

merged 17 commits into from
Oct 27, 2023

Conversation

leifmadsen
Copy link
Member

Import changes for STF 1.5.3

leifmadsen and others added 17 commits October 28, 2022 16:35
The GitHub Actions checkout action v2 is deprecated and needs to move to
version 3.
* Implement changes for operator-sdk-1.26.0 testing

Implement changes that allow testing validation via operator-sdk-1.26.0
without bumping the entire bundle generation process from
operator-sdk-0.19.4 to post-operator-sdk-1.x.

These are the same tests run for validation during product pipeline
verification.

* Adds test to verify building of the bundle image works.
* Adds KinD deployment to allow executing scorecard checks.

Related: STF-1252

* Simplify use of RELEASE_VERSION variable
* maxOpenShiftVersion 4.12 in OLM properties

* Remove invalid line from properties.yaml

---------

Co-authored-by: Leif Madsen <lmadsen@redhat.com>
* Move to newest oauth-proxy container

* Moved definitions to "Related Images"

* bcrypt deps not necesarry in SGO
Update generate_bundle.sh to output data in JSON so that it can be
consumed more easily by Ansible. Will be used by the index deployment
method in stf-run-ci.
* Expose some logs from generate_bundle
* Add default value for OPERATOR_SDK
* use absolute path with readlink
* set -x
* update operator-sdk command
* truncate logfile, don't log pushd/popd
* ignore error truncating /dev/null
Bump the origin-ansible-operator base image from 4.10 to 4.12.

Related STF-1524
* Add requires infrastructure annotations

Add required infrastructure annotations for the bundle. Implementation
is done in generate_bundle.sh because the annotations.yaml file in the
deploy/olm-catalog/ directory is not read by operator-sdk-0.19.4. Append
required additional feature annotations to the generated
annotations.yaml by operator-sdk generate bundle.

Related STF-1530

* Revert "Add requires infrastructure annotations"

This reverts commit 8a9b2c6.

* Add required infrastructure annotations

Add the required infrastructure annotations to the CSV directly, as that
is the expected location for the new annotations.

Related: STF-1530

* Generate CSV contents with operator-sdk
Support STF 1.5 from OCP 4.11 through 4.14 for the next release as OCP 4.10 is now EOL.
* Update base image to pass security scans

Update the base image with a dnf update (need to excluse ansible because
ansible updates aren't compatible with the current build). This keeps
packages up to date to allow the resulting image to pass registry
security scans.

* Add comments to help understand Dockerfile readout
@leifmadsen leifmadsen self-assigned this Oct 26, 2023
@leifmadsen leifmadsen added release Release delivery 1.5 labels Oct 26, 2023
Copy link
Contributor

@elfiesmelfie elfiesmelfie left a comment

Choose a reason for hiding this comment

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

All changes were already reviewed, and the tests are passed.

@leifmadsen leifmadsen merged commit 519e2eb into stable-1.5 Oct 27, 2023
6 checks passed
@leifmadsen leifmadsen deleted the import/stf153 branch October 27, 2023 15:00
@csibbitt csibbitt mentioned this pull request Feb 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1.5 release Release delivery
Development

Successfully merging this pull request may close these issues.

3 participants