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 metrics proxy #2182

Merged
merged 1 commit into from
Sep 8, 2022
Merged

Add metrics proxy #2182

merged 1 commit into from
Sep 8, 2022

Conversation

vthapar
Copy link
Contributor

@vthapar vthapar commented Aug 18, 2022

Refer submariner-io/enhancements/pull/128
Depends on submariner-io/subctl/pull/212
Depends on #2209

Signed-off-by: Vishal Thapar [email protected]

@submariner-bot
Copy link
Contributor

🤖 Created branch: z_pr2182/vthapar/metrics-proxy
🚀 Full E2E won't run until the "ready-to-test" label is applied. I will add it automatically once the PR has 2 approvals, or you can add it manually.

@vthapar vthapar requested a review from mkolesnik August 18, 2022 07:19
@vthapar vthapar marked this pull request as ready for review August 18, 2022 09:17
vthapar added a commit to vthapar/subctl that referenced this pull request Aug 19, 2022
With the redesign of metrics, we don't need to open metrics port in the
cloud anymore. This also marks the `metrics-ports` flag as deprecated.

Refer submariner-io/enhancements/pull/128
Depends On submariner-io/submariner-operator/pull/2182

Signed-off-by: Vishal Thapar <[email protected]>
controllers/submariner/metrics_proxy_resources.go Outdated Show resolved Hide resolved
controllers/submariner/metrics_proxy_resources.go Outdated Show resolved Hide resolved
controllers/submariner/metrics_proxy_resources.go Outdated Show resolved Hide resolved
controllers/submariner/metrics_proxy_resources.go Outdated Show resolved Hide resolved
controllers/submariner/metrics_proxy_resources.go Outdated Show resolved Hide resolved
controllers/submariner/metrics_proxy_resources.go Outdated Show resolved Hide resolved
controllers/submariner/submariner_controller.go Outdated Show resolved Hide resolved
controllers/submariner/gateway_resources.go Outdated Show resolved Hide resolved
Copy link
Contributor

@mkolesnik mkolesnik left a comment

Choose a reason for hiding this comment

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

A few suggestions, overall looks good

controllers/submariner/metrics_proxy_resources.go Outdated Show resolved Hide resolved
controllers/submariner/metrics_proxy_resources.go Outdated Show resolved Hide resolved
controllers/constants/constants.go Outdated Show resolved Hide resolved
@@ -227,6 +231,8 @@ func (r *Reconciler) Reconcile(ctx context.Context, request reconcile.Request) (
return reconcile.Result{}, err
}

// TODO: vthapar Do we need proxy status?
Copy link
Contributor

Choose a reason for hiding this comment

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

Seems that for consistency we should, no?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Status bits are currently added to SUbmariner CR's status field. This will require additions to Submariner CR in submariner repo. We're also missing status for NetworkPluginSyncer. Should we bring them both in a separate issue?

Copy link
Contributor

Choose a reason for hiding this comment

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

I dont think syncer should be part of it, it's a separate issue

Copy link
Member

Choose a reason for hiding this comment

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

Yup, we shouldn’t take care of the syncer here, but I agree we should add the metrics status information here while we’re at it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@skitt @mkolesnik Code here is to update Submariner CR's Status fields with DaemonSet's status. Till we add the CR fields in submariner we can't do anything here.

controllers/submariner/globalnet_resources.go Outdated Show resolved Hide resolved
controllers/submariner/gateway_resources.go Outdated Show resolved Hide resolved
@vthapar vthapar requested a review from mkolesnik August 24, 2022 07:15
tpantelis pushed a commit to vthapar/subctl that referenced this pull request Aug 24, 2022
With the redesign of metrics, we don't need to open metrics port in the
cloud anymore. This also marks the `metrics-ports` flag as deprecated.

Refer submariner-io/enhancements/pull/128
Depends On submariner-io/submariner-operator/pull/2182

Signed-off-by: Vishal Thapar <[email protected]>
tpantelis pushed a commit to vthapar/subctl that referenced this pull request Aug 24, 2022
With the redesign of metrics, we don't need to open metrics port in the
cloud anymore. This also marks the `metrics-ports` flag as deprecated.

Refer submariner-io/enhancements/pull/128
Depends On submariner-io/submariner-operator/pull/2182

Signed-off-by: Vishal Thapar <[email protected]>
tpantelis pushed a commit to submariner-io/subctl that referenced this pull request Aug 24, 2022
With the redesign of metrics, we don't need to open metrics port in the
cloud anymore. This also marks the `metrics-ports` flag as deprecated.

Refer submariner-io/enhancements/pull/128
Depends On submariner-io/submariner-operator/pull/2182

Signed-off-by: Vishal Thapar <[email protected]>
controllers/constants/constants.go Outdated Show resolved Hide resolved
@@ -227,6 +231,8 @@ func (r *Reconciler) Reconcile(ctx context.Context, request reconcile.Request) (
return reconcile.Result{}, err
}

// TODO: vthapar Do we need proxy status?
Copy link
Contributor

Choose a reason for hiding this comment

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

I dont think syncer should be part of it, it's a separate issue

controllers/submariner/globalnet_resources.go Outdated Show resolved Hide resolved
controllers/submariner/submariner_controller.go Outdated Show resolved Hide resolved
@vthapar
Copy link
Contributor Author

vthapar commented Sep 6, 2022

I manually squashed older review commits into parent commit to make it easier to rebase conflicts.

Copy link
Contributor

@mkolesnik mkolesnik left a comment

Choose a reason for hiding this comment

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

LGTM

@submariner-bot submariner-bot added the ready-to-test When a PR is ready for full E2E testing label Sep 6, 2022
@skitt
Copy link
Member

skitt commented Sep 6, 2022

@vthapar please squash the latest review commit.

Copy link
Contributor

@mkolesnik mkolesnik left a comment

Choose a reason for hiding this comment

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

Please add release notes as part of the PR :)

@vthapar
Copy link
Contributor Author

vthapar commented Sep 7, 2022

Please add release notes as part of the PR

@mkolesnik Release notes should be added as new comment or updated in the parent comment?

@mkolesnik
Copy link
Contributor

Please add release notes as part of the PR

@mkolesnik Release notes should be added as new comment or updated in the parent comment?

It should be part of the PR - as we discussed on the weekly calls, and the pending documentation (submariner-io/submariner-website#802)

@vthapar
Copy link
Contributor Author

vthapar commented Sep 7, 2022

Please add release notes as part of the PR

@mkolesnik Release notes should be added as new comment or updated in the parent comment?

It should be part of the PR - as we discussed on the weekly calls, and the pending documentation (submariner-io/submariner-website#802)

I saw the documentation PR but that is still under review. I don't see a release-notes directory in operator repo. Also, what should be the date in filename YYYYMMDD format? Date release note is added to PR?

@tpantelis tpantelis enabled auto-merge (rebase) September 7, 2022 17:12
@vthapar vthapar requested a review from dfarrell07 as a code owner September 8, 2022 10:41
@tpantelis
Copy link
Contributor

@vthapar The release notes file has linting errors.

@vthapar vthapar force-pushed the metrics-proxy branch 2 times, most recently from 1f56a75 to ed938a7 Compare September 8, 2022 12:13
@tpantelis tpantelis merged commit 0104812 into submariner-io:devel Sep 8, 2022
@submariner-bot
Copy link
Contributor

🤖 Closed branches: [z_pr2182/vthapar/metrics-proxy]

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
check-prometheus This change should be verified using the Prometheus checks docs-needed ready-to-test When a PR is ready for full E2E testing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants