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

Add requires infrastructure annotations #146

Merged
merged 4 commits into from
Oct 11, 2023

Conversation

leifmadsen
Copy link
Member

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

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
Copy link
Contributor

@csibbitt csibbitt left a comment

Choose a reason for hiding this comment

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

These annotations look correct to me.

There are some items we are close to fulfilling, and some interesting aspirational items including lots of other recommendations in that best practices guide we should probably go through in more detail.

@@ -34,6 +34,18 @@ generate_bundle() {
popd > /dev/null 2>&1

sed -i -E "${REPLACE_REGEX}" "${WORKING_DIR}/manifests/${OPERATOR_NAME}.clusterserviceversion.yaml"
cat >> "${WORKING_DIR}/metadata/annotations.yaml" << EOF
features.operators.openshift.io/disconnected: "false"
features.operators.openshift.io/fips-compliant: "false"
Copy link
Contributor

Choose a reason for hiding this comment

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

My hunch is that we could run in a FIPS-140 environment, but I don't think we have any place to do explicit testing yet. Can shiftstack deploy OCP in fips mode? This might be trivial to try.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yea we have this spike (https://issues.redhat.com/browse/STF-1384) for STF + FIPS filed a long time ago. I think we were mostly waiting for our CI framework to get updated and make it easier to add different deployment environments.

This might be something we could look at doing as part of disconnected because we'll want our CI systems to deploy OCP in disconnected mode, and then work through installation of STF via disconnected mode as our default installation method. If it's relatively simple to put OCP into FIPS compatible mode as well, then we can layer FIPS + disconnected in the same environment.

features.operators.openshift.io/cnf: "false"
features.operators.openshift.io/cni: "false"
features.operators.openshift.io/csi: "false"
features.operators.openshift.io/tls-profiles: "false"
Copy link
Contributor

Choose a reason for hiding this comment

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

That's an RFE I've never considered before, but I can certainly see why it would be desirable!

@leifmadsen
Copy link
Member Author

These annotations look correct to me.

There are some items we are close to fulfilling, and some interesting aspirational items including lots of other recommendations in that best practices guide we should probably go through in more detail.

I created https://issues.redhat.com/browse/STF-1554 in STF 2.0 to do an intentional walkthrough of the best practices so we can get closer to operating in ideal conditions. Thanks!

@leifmadsen leifmadsen self-assigned this Oct 11, 2023
@leifmadsen leifmadsen added the do-not-merge Do Not Merge (WIP) label Oct 11, 2023
@leifmadsen
Copy link
Member Author

Comment at infrawatch/service-telemetry-operator#499 (comment) also applicable here. More changes inbound.

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

Related: STF-1530
@leifmadsen leifmadsen removed the do-not-merge Do Not Merge (WIP) label Oct 11, 2023
@leifmadsen
Copy link
Member Author

Merging once infrawatch/service-telemetry-operator#499 passes all CI

@leifmadsen leifmadsen merged commit 9780020 into master Oct 11, 2023
6 checks passed
@leifmadsen leifmadsen deleted the stf-1530/update-operator-metadata branch October 11, 2023 22:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants