Skip to content

Remove any references to OCP in the helm charts and upstream manifests #2157

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
Merged
merged 5 commits into from
May 12, 2021
Merged

Remove any references to OCP in the helm charts and upstream manifests #2157

merged 5 commits into from
May 12, 2021

Conversation

timflannagan
Copy link
Member

@timflannagan timflannagan commented May 11, 2021 •
edited
Loading

Fixes #2130

Continue to decouple the (now) upstream repository from the OCP platform after #2153 landed.

  • Removes the OCP helm chart templates and the rendered manifests.
  • Removes any OCP-related helm chart conditionals.
  • Removes any references in the Makefile and scripts/ bash scripts for handling OCP helm charts and downstream manifests.

A couple of things to note:

  • We may want to deflate the deploy/upstream -> deploy in this PR, or a future PR.
  • I kept the current PrometheusRules and ServiceMonitor helm charts as those appear to be agnostic of OCP and live as upstream CRDs in the various Prometheus-related repositories. Those helm charts are still gated by the OCP platform conditional though.
  • Do we want to continue naming the manifests by the CVO run levels, or remove that entirely?

@openshift-ci openshift-ci bot requested review from exdx and kevinrizza May 11, 2021 14:49
@timflannagan
Copy link
Member Author

There's a couple of outstanding questions in my PR description that I'd like to get addressed before merging this.

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 11, 2021
timflannagan
timflannagan commented May 11, 2021
View reviewed changes
deploy/chart/templates/0000_50_olm_08-catalog-operator.deployment.yaml
@@ -64,26 +61,10 @@ spec:
path: /healthz
port: {{ .Values.catalog.service.internalPort }}
terminationMessagePolicy: FallbackToLogsOnError
env:
Copy link
Member Author

Choose a reason for hiding this comment

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

A quick note as I need to double-check against the current master branch, but this appeared to be problematic in the context of the upstream manifests as we'd essentially be rendering an empty env map as the only key would be that RELEASE_VERSION variable, but that conditional check would evaluate to false.

@timflannagan timflannagan force-pushed the remove-ocp-manifests branch from 325e813 to 981cd34 Compare May 11, 2021 14:51
@timflannagan timflannagan force-pushed the remove-ocp-manifests branch from d6b123b to 620fd4f Compare May 11, 2021 15:41
@timflannagan
Makefile,scripts: Remove references to handling OCP helm charts/manif…
110cd60 
…ests

- Remove the scripts/add_release_annotation.sh bash script as it only
  injects OCP-related annotations.
- Remove any Makefile conditional checks for the OCP platform when
  generating release manifests.

Signed-off-by: timflannagan <[email protected]>
@timflannagan timflannagan force-pushed the remove-ocp-manifests branch from 620fd4f to 23dcd46 Compare May 11, 2021 15:43
benluddy
benluddy reviewed May 11, 2021
View reviewed changes
@benluddy
Copy link
Contributor

#2091

@timflannagan
Makefile: Remove references to the internal ART team
8f77940 
Remove the need to check if `SOURCE_GIT_COMMIT` exists, and instead rely
on the output of `git rev-parse HEAD`.

Signed-off-by: timflannagan <[email protected]>
@timflannagan
Remove the deploy/ocp directory
5c26436 
- Additional work to decouple the upstream repository from OCP after operator-framework#2153 landed.
- Removes the OCP helm chart templates and the rendered manifests.

Signed-off-by: timflannagan <[email protected]>
@timflannagan
deploy/chart: Remove any OCP-related helm chart conditionals
48b8123 
Signed-off-by: timflannagan <[email protected]>
@timflannagan
deploy/charts: Any monitoring configuration for the PrometheusRule/Se…
4e7a7da 
…rviceMonitor resources

Add a monitoring section to the helm chart values and update the
helm conditional check on the PrometheusRule and ServiceMonitor custom
resources to gate on wheterh monitoring has been enabled vs. whether the
platform is set to "ocp".

Signed-off-by: timflannagan <[email protected]>
@timflannagan timflannagan force-pushed the remove-ocp-manifests branch from 23dcd46 to 4e7a7da Compare May 11, 2021 16:04
@benluddy
Copy link
Contributor

/approve

The diff is already intimidating, so I'd vote to revisit the manifest names and deploy/ reshuffling later.

@openshift-ci
Copy link

openshift-ci bot commented May 11, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: benluddy, timflannagan

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 11, 2021
@timflannagan
Copy link
Member Author

/retest

@timflannagan
Copy link
Member Author

/rerun-all

@timflannagan
Copy link
Member Author

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 11, 2021
@exdx
Copy link
Member

exdx commented May 12, 2021

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 12, 2021
@openshift-merge-robot openshift-merge-robot merged commit cc47b63 into operator-framework:master May 12, 2021
@timflannagan timflannagan deleted the remove-ocp-manifests branch May 12, 2021 17:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@benluddy benluddy benluddy left review comments

@exdx exdx Awaiting requested review from exdx

@kevinrizza kevinrizza Awaiting requested review from kevinrizza

Assignees

@exdx exdx

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Remove the root manifests directory and OCP/downstream helm charts
4 participants
@timflannagan @benluddy @exdx @openshift-merge-robot