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

Catalog renaming OCS -> rh-operators #429

Merged
merged 3 commits into from
Aug 29, 2018

Conversation

ecordell
Copy link
Member

Also removed the namespaceSelector from the ServiceMonitor example, and removed the edit verbs from the edit aggregated role for OLM

@ecordell ecordell force-pushed the catalog-rename branch 2 times, most recently from 344522f to eb00936 Compare August 22, 2018 18:49
@ecordell ecordell requested review from njhale and alecmerdler August 22, 2018 19:36
alecmerdler
alecmerdler previously approved these changes Aug 22, 2018
Copy link
Member

@alecmerdler alecmerdler left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Collaborator

@sichvoge sichvoge left a comment

Choose a reason for hiding this comment

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

MH. @ecordell You are reverting all changes i've done to the Prometheus CSV back to its original state. The ones from this PR: #425

Also, the final alm-example should look like this:

[{"apiVersion":"monitoring.coreos.com/v1","kind":"Prometheus","metadata":{"name":"example","labels":{"prometheus":"k8s"}},"spec":{"replicas":2,"version":"v2.3.2","serviceAccountName":"prometheus-k8s","securityContext": {}, "serviceMonitorSelector":{"matchExpressions":[{"key":"k8s-app","operator":"Exists"}]},"ruleSelector":{"matchLabels":{"role":"prometheus-rulefiles","prometheus":"k8s"}},"alerting":{"alertmanagers":[{"namespace":"monitoring","name":"alertmanager-main","port":"web"}]}}},{"apiVersion":"monitoring.coreos.com/v1","kind":"ServiceMonitor","metadata":{"name":"example","labels":{"k8s-app":"prometheus"}},"spec":{"selector":{"matchLabels":{"k8s-app":"prometheus"}},"endpoints":[{"port":"web","interval":"30s"}]}},{"apiVersion":"monitoring.coreos.com/v1","kind":"Alertmanager","metadata":{"name":"alertmanager-main"},"spec":{"replicas":3}}]

also stubs out the "certified-operators" catalog
@ecordell
Copy link
Member Author

@sichvoge Fixed the issues you pointed out

@robszumski
Copy link
Collaborator

LGTM

@alecmerdler Just to confirm, the Console will pick up these changes automatically?

Copy link
Collaborator

@sichvoge sichvoge left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@alecmerdler alecmerdler left a comment

Choose a reason for hiding this comment

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

@ecordell There is one place where we look for the ocs catalog source directly, I will make a PR to fix that.

@alecmerdler
Copy link
Member

@ecordell Will this be targeting 3.11?

@ecordell
Copy link
Member Author

@alecmerdler yes it is, this is in response to @robszumski requests for changes for 3.11

@ecordell ecordell merged commit 0a5a3a2 into operator-framework:master Aug 29, 2018
njhale pushed a commit to njhale/operator-lifecycle-manager that referenced this pull request Sep 10, 2018
@ecordell ecordell deleted the catalog-rename branch September 21, 2018 12:54
ecordell added a commit to ecordell/operator-lifecycle-manager that referenced this pull request Mar 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants