-
Notifications
You must be signed in to change notification settings - Fork 18
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 Prometheus configuration to bundle OCP #305
Add Prometheus configuration to bundle OCP #305
Conversation
Signed-off-by: Carlo Lobrano <c.lobrano@gmail.com>
- restored `config/manifests/metrics` and `config/optional/prometheus` from main. - created a new `config/manifests/metrics-ocp` and `config/optional/prometheus-ocp` with the new User Workload Prometheus (UWP) monitoring configuration from this PR. - updated documentation under `config/manifests/readme.md` with all the steps to create the bundle predisposed for UWP and configure UWP itself. Signed-off-by: Carlo Lobrano <c.lobrano@gmail.com>
- Moved config/manifests/metrics-ocp configuration files to config/manifests/ocp, since this configuration will always be part of OCP bundle - Moved readme in config/manifests/metrics-ocp into config/optional/prometheus-ocp Signed-off-by: Carlo Lobrano <c.lobrano@gmail.com>
Skipping CI for Draft Pull Request. |
bf283de
to
acb8d03
Compare
/test 4.15-openshift-e2e |
The target was already building OCP bundle. Changing the name to reflect this behavior. Signed-off-by: Carlo Lobrano <c.lobrano@gmail.com>
acb8d03
to
12edc4d
Compare
The test didn't start. Lets try again |
Add a test script to build the OCP bundle with prometheus metrics, but pushing the images to quay.io/username (not medik8s!) for testing. Signed-off-by: Carlo Lobrano <c.lobrano@gmail.com>
12edc4d
to
8ecfe98
Compare
Signed-off-by: Carlo Lobrano <c.lobrano@gmail.com>
OCP Metrics configuration was moved in config/manifests/ocp and config/manifests/metrics-ocp removed, so this target is not useful anymore. Signed-off-by: Carlo Lobrano <c.lobrano@gmail.com>
Signed-off-by: Carlo Lobrano <c.lobrano@gmail.com>
Signed-off-by: Carlo Lobrano <c.lobrano@gmail.com>
Makefile
Outdated
@@ -375,11 +375,6 @@ bundle-metrics: bundle-base ## Generate bundle manifests and metadata with metri | |||
$(KUSTOMIZE) build config/manifests/metrics | $(OPERATOR_SDK) generate --verbose bundle -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS) | |||
$(MAKE) bundle-validate | |||
|
|||
.PHONY: bundle-metrics-ocp |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
there still is bundle-build-metrics-ocp and container-build-metrics-ocp
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
removed also bundle-metrics 👍
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
removed also bundle-metrics
hm, IIRC the idea was that it can be used to manually create a k8s bundle some non OCP specific prometheus bits... 🤔
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
other than that lgtm! 🙂
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oops, let me check again
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
so, IIUC
bundle-metrics + bundle-build-metrics + container-build-metrics
should to be restored (or at least the first two)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
NIT: Can you be (in a few places) more specific about which build/bundle are you building or testing?
Considering that upstream we are more K8s front, thus the general tests in upstream CI might be more relevant for K8s and less to OCP Prometheus
@@ -30,7 +30,7 @@ jobs: | |||
run: make manifests bundle-k8s bundle-reset test |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
bundle-k8s
?
If we are testing upstream OCP then it should be bundle-metrics-ocp
, otherwise the Test container build OCP Prometheus
should be changed to Test container build Kubernetes
and the target below as well
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is for unittests and catching unwanted bundle changes (see ea5e7be), so it looks right to me. I'll make it clearer changing the name.
Regarding the "Test container build", while it is true we are more keen on k8s here, I think it would be better to test both, as it would be relevant to catch breaking changes at this early stage. For this reason I'd test both k8s and ocp container builds
wdyt?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
SGTM
aee9de0
to
9bce039
Compare
/lgtm |
Signed-off-by: Carlo Lobrano <c.lobrano@gmail.com>
…unittest action Signed-off-by: Carlo Lobrano <c.lobrano@gmail.com>
Signed-off-by: Carlo Lobrano <c.lobrano@gmail.com>
9bce039
to
df551f1
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍🏼 🙂
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: clobrano, slintes 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 |
/retest |
/unhold |
Why we need this PR
To allow User Workload Prometheus (UWP) metrics scraping for NHC, we need to modify existing bundle configuration as well as and deploy new configuration.
Changes made
Currently, only in OCP we are sure to have Prometheus installed, so this PR affects the bundle created for OCP only.
config/optional/prometheus-ocp
directory to hold the new configuration and documentationconfig/manifests/ocp/
node-healthcheck-tls
Which issue(s) this PR fixes
https://issues.redhat.com/browse/ECOPROJECT-1760
Test plan
To configure NHC with UWP follow the steps in
config/optional/prometheus-ocp/readme.md
.To ease the test process, the script
hack/ocp/test_create_bundle_ocp_image_in_quay.sh
build the bundle image and pushes it to quay.io.