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

ROX-20148 - Remove operator installation from development scripts #1471

Merged
merged 4 commits into from
Nov 21, 2023
Merged

ROX-20148 - Remove operator installation from development scripts #1471

merged 4 commits into from
Nov 21, 2023

Conversation

SimonBaeumer
Copy link
Member

Description

🔥 🔥 🔥

Checklist (Definition of Done)

  • Unit and integration tests added
  • Added test description under Test manual
  • Documentation added if necessary (i.e. changes to dev setup, test execution, ...)
  • CI and all relevant tests are passing
  • Add the ticket number to the PR title if available, i.e. ROX-12345: ...
  • Discussed security and business related topics privately. Will move any security and business related topics that arise to private communication channel.
  • Add secret to app-interface Vault or Secrets Manager if necessary
  • RDS changes were e2e tested manually
  • Check AWS limits are reasonable for changes provisioning new resources

Test manual

TODO: Add manual testing efforts

# To run tests locally run:
make db/teardown db/setup db/migrate
make ocm/setup OCM_OFFLINE_TOKEN=<ocm-offline-token> OCM_ENV=development
make verify lint binary test test/integration

@SimonBaeumer
Copy link
Member Author

/retest

kovayur
kovayur approved these changes Nov 20, 2023
View reviewed changes
Copy link
Contributor

@kovayur kovayur left a comment

Choose a reason for hiding this comment

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

Looks good already, but I believe we could clean up even more

dev/env/manifests/shared/00-namespace.yaml
kind: Namespace
apiVersion: v1
metadata:
name: $STACKROX_OPERATOR_NAMESPACE
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we use ACSCS_NAMESPACE only and rename it from acscs to rhacs like for the real clusters?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, but outside of this PR. Here I am only removing the development scripts, the proposed change needs more testing.

dev/env/manifests/rhacs-operator/quay/01-catalogsource.yaml
namespace: "$STACKROX_OPERATOR_NAMESPACE"
spec:
sourceType: grpc
image: "${STACKROX_OPERATOR_INDEX_IMAGE}"
Copy link
Contributor

Choose a reason for hiding this comment

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

Remove this variable from lib.sh

Copy link
Member Author

Choose a reason for hiding this comment

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

done

dev/env/manifests/rhacs-operator/marketplace/03-subscription.yaml
name: stackrox-operator-test-subscription
namespace: "$STACKROX_OPERATOR_NAMESPACE"
spec:
channel: $STACKROX_OPERATOR_CHANNEL
Copy link
Contributor

Choose a reason for hiding this comment

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

I see another usages that should be removed as well:

  1. 11-operator-channel.env
  2. lib.sh

Copy link
Member Author

Choose a reason for hiding this comment

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

done

dev/env/manifests/rhacs-operator/marketplace/03-subscription.yaml
source: redhat-operators
sourceNamespace: openshift-marketplace
config:
resources: $RHACS_OPERATOR_RESOURCES
Copy link
Contributor

Choose a reason for hiding this comment

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

Please cleanup lib.sh and the occurrences of RHACS_OPERATOR_RESOURCES_DEFAULTS

Copy link
Member Author

Choose a reason for hiding this comment

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

nice catch thx, done

@openshift-ci openshift-ci bot added the lgtm label Nov 20, 2023
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Nov 20, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kovayur, SimonBaeumer

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:
  • OWNERS [SimonBaeumer,kovayur]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot removed the lgtm label Nov 21, 2023
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Nov 21, 2023

New changes are detected. LGTM label has been removed.

@SimonBaeumer SimonBaeumer merged commit bb6c155 into main Nov 21, 2023
6 checks passed
@SimonBaeumer SimonBaeumer deleted the sb/rox-20148-remove-operator-from-dev-scripts branch November 21, 2023 13:06
johannes94 pushed a commit that referenced this pull request Jan 18, 2024
@SimonBaeumer
ROX-20148 - Remove operator installation from development scripts (#1471
b52b898 
)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kovayur kovayur kovayur approved these changes

Assignees

@kovayur kovayur

Labels
approved
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@SimonBaeumer @kovayur