feat: Remove ocm dependency from policy controller #711

mikenairn · 2023-12-07T21:31:54Z

Remove all dependencies related to OCM from the policy controller and associated code.

Instead of labelling the OCM ManagedCluster resources with weight and geo metadata, the labels are now added to the gateway itself with the cluster name embedded.

"kuadrant.io/kind-mgc-control-plane_lb-attribute-weight":   "TSTATTR",
"kuadrant.io/kind-mgc-control-plane_lb-attribute-geo-code": "EU"

closes #622

ToDo

Add Watch for ManagedClusters to Gateway controller and transfer kuadrant.io labels

maksymvavilov · 2023-12-15T11:52:35Z

/label tide/merge-method-squash

pkg/controllers/dnspolicy/dnspolicy_controller.go

pkg/controllers/events/cluster_eventmapper.go

maleck13 · 2024-01-12T12:18:30Z

pkg/dns/target.go

@@ -82,12 +83,6 @@ func (t *MultiClusterGatewayTarget) setClusterGatewayTargets(clusterGateways []C
 	return nil
 }

-// ClusterGateway contains the addresses of a Gateway on a single cluster and the attributes of the target cluster.


why did this move into a utils package? Wondering would it be better in the api pkg as a none CRD type?

like perhaps cluster_types.go

Yeah gateway wrapper belongs elsewhere. pkg/apis certainly makes more sense. Moving that though would probably be better done in a different PR either before or after this one. Will look into it, if it doesn't add a lot of additional changes I'll add it here.

I'm going to do a follow up for this. There are some other changes/refactors/cleanup i want to make to the code that could all be part of a separate PR that has no functional changes.

pkg/utils/gateway_wrapper.go

maleck13

Question about location of the wrapper types. Also would be good to have some verification steps

Remove all dependencies related to OCM from the policy controller and associated code. Instead of labeling the OCM ManagedCluster resources with weight and geo metadata, the labels are now added to the gateway itself with the cluster name embedded. ``` "kuadrant.io/kind-mgc-control-plane_lb-attribute-weight": "TSTATTR", "kuadrant.io/kind-mgc-control-plane_lb-attribute-geo-code": "EU" ```

Adds the watch for ManagedCluster resources to the gateway controller and adds an additional step in the reconcile (reconcileClusterLabels) to map the kuadrant.io labels from cluster(s) to gateway. reconcileClusterLabels - Not Implemented

…+ integration test bump golangci-lint to 1.55.2 patch in e2e

policies, maps cluster events to gateways. Use "clusters.kuadrant.io" for all cluster labels on the target gateway and remove all existing cluster labels during reconciliation in order to remove labels removed from the cluster resource. Ensure only cluster labels for the current cluster are added when processing labels.

philbrookes

/lgtm

openshift-ci · 2024-01-23T11:40:03Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mikenairn, philbrookes

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~~ [mikenairn,philbrookes]

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

openshift-ci bot added the do-not-merge/work-in-progress label Dec 7, 2023

mikenairn had a problem deploying to e2e-internal December 7, 2023 21:31 — with GitHub Actions Failure

openshift-ci bot added the approved label Dec 7, 2023

mikenairn force-pushed the 662_remove_ocm_dependency branch from 89763f2 to 179d72f Compare December 7, 2023 21:38

mikenairn temporarily deployed to e2e-internal December 7, 2023 21:38 — with GitHub Actions Inactive

mikenairn had a problem deploying to e2e-internal December 8, 2023 09:57 — with GitHub Actions Failure

mikenairn temporarily deployed to e2e-internal December 8, 2023 10:03 — with GitHub Actions Inactive

mikenairn force-pushed the 662_remove_ocm_dependency branch from 93759a5 to 8e31e4b Compare December 8, 2023 10:05

mikenairn temporarily deployed to e2e-internal December 8, 2023 10:05 — with GitHub Actions Inactive

mikenairn force-pushed the 662_remove_ocm_dependency branch from 8e31e4b to 2349f2b Compare December 8, 2023 10:16

mikenairn had a problem deploying to e2e-internal December 8, 2023 10:16 — with GitHub Actions Failure

mikenairn temporarily deployed to e2e-internal December 8, 2023 12:46 — with GitHub Actions Inactive

maksymvavilov force-pushed the 662_remove_ocm_dependency branch from 2349f2b to 1fa4be0 Compare December 15, 2023 11:05

maksymvavilov temporarily deployed to e2e-internal December 15, 2023 11:05 — with GitHub Actions Inactive

maksymvavilov marked this pull request as ready for review December 15, 2023 11:05

openshift-ci bot removed the do-not-merge/work-in-progress label Dec 15, 2023

maksymvavilov temporarily deployed to e2e-internal December 15, 2023 11:52 — with GitHub Actions Inactive

openshift-ci bot added the tide/merge-method-squash Instructing Openshift CI bot to squash commits on merge label Dec 15, 2023

maleck13 reviewed Dec 19, 2023

View reviewed changes

pkg/controllers/dnspolicy/dnspolicy_controller.go Outdated Show resolved Hide resolved

maleck13 reviewed Dec 19, 2023

View reviewed changes

pkg/controllers/events/cluster_eventmapper.go Outdated Show resolved Hide resolved

maksymvavilov had a problem deploying to e2e-internal December 20, 2023 15:21 — with GitHub Actions Failure

maksymvavilov force-pushed the 662_remove_ocm_dependency branch from 81fc3f7 to 067f964 Compare December 20, 2023 15:25

maksymvavilov had a problem deploying to e2e-internal December 20, 2023 15:25 — with GitHub Actions Failure

maksymvavilov had a problem deploying to e2e-internal December 21, 2023 09:39 — with GitHub Actions Failure

maksymvavilov had a problem deploying to e2e-internal December 21, 2023 10:02 — with GitHub Actions Failure

maksymvavilov force-pushed the 662_remove_ocm_dependency branch from 067f964 to 26fb49c Compare December 21, 2023 11:46

maksymvavilov had a problem deploying to e2e-internal December 21, 2023 11:46 — with GitHub Actions Failure

maksymvavilov force-pushed the 662_remove_ocm_dependency branch from 26fb49c to 17dff20 Compare December 21, 2023 13:06

maksymvavilov had a problem deploying to e2e-internal December 21, 2023 13:06 — with GitHub Actions Failure

maleck13 reviewed Jan 12, 2024

View reviewed changes

pkg/utils/gateway_wrapper.go Show resolved Hide resolved

maleck13 reviewed Jan 12, 2024

View reviewed changes

maksymvavilov had a problem deploying to e2e-internal January 16, 2024 09:52 — with GitHub Actions Failure

maksymvavilov had a problem deploying to e2e-internal January 16, 2024 12:56 — with GitHub Actions Failure

mikenairn force-pushed the 662_remove_ocm_dependency branch from 0d34848 to 02f61f5 Compare January 17, 2024 10:44

mikenairn temporarily deployed to e2e-internal January 17, 2024 10:44 — with GitHub Actions Inactive

mikenairn force-pushed the 662_remove_ocm_dependency branch from 02f61f5 to 073e1f5 Compare January 17, 2024 14:18

mikenairn temporarily deployed to e2e-internal January 17, 2024 14:18 — with GitHub Actions Inactive

mikenairn temporarily deployed to e2e-internal January 18, 2024 16:22 — with GitHub Actions Inactive

mikenairn added 2 commits January 22, 2024 09:17

mikenairn force-pushed the 662_remove_ocm_dependency branch from 24c5c16 to fd70c83 Compare January 22, 2024 09:18

mikenairn temporarily deployed to e2e-internal January 22, 2024 09:18 — with GitHub Actions Inactive

mikenairn force-pushed the 662_remove_ocm_dependency branch from fd70c83 to 094605f Compare January 22, 2024 09:37

mikenairn temporarily deployed to e2e-internal January 22, 2024 09:37 — with GitHub Actions Inactive

mikenairn force-pushed the 662_remove_ocm_dependency branch from 094605f to 1227ec6 Compare January 22, 2024 09:52

mikenairn temporarily deployed to e2e-internal January 22, 2024 09:52 — with GitHub Actions Inactive

maksymvavilov and others added 2 commits January 23, 2024 08:01

Enable GW controller to transfer label from ManagedCluster to the GW …

c67d891

…+ integration test bump golangci-lint to 1.55.2 patch in e2e

mikenairn force-pushed the 662_remove_ocm_dependency branch from 1227ec6 to 1846155 Compare January 23, 2024 08:02

mikenairn temporarily deployed to e2e-internal January 23, 2024 08:02 — with GitHub Actions Inactive

mikenairn removed the tide/merge-method-squash Instructing Openshift CI bot to squash commits on merge label Jan 23, 2024

philbrookes approved these changes Jan 23, 2024

View reviewed changes

openshift-ci bot assigned philbrookes Jan 23, 2024

openshift-ci bot added the lgtm label Jan 23, 2024

openshift-merge-bot bot merged commit aadac89 into main Jan 23, 2024
10 checks passed

mikenairn deleted the 662_remove_ocm_dependency branch January 23, 2024 11:44

adam-cattermole mentioned this pull request Jan 23, 2024

Remove --ocm-hub flag and update bundle Kuadrant/kuadrant-operator#403

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Remove ocm dependency from policy controller #711

feat: Remove ocm dependency from policy controller #711

mikenairn commented Dec 7, 2023 •

edited by maksymvavilov

Loading

maksymvavilov commented Dec 15, 2023

maleck13 Jan 12, 2024

maleck13 Jan 12, 2024

mikenairn Jan 15, 2024

mikenairn Jan 23, 2024

maleck13 left a comment

philbrookes left a comment

openshift-ci bot commented Jan 23, 2024

feat: Remove ocm dependency from policy controller #711

feat: Remove ocm dependency from policy controller #711

Conversation

mikenairn commented Dec 7, 2023 • edited by maksymvavilov Loading

maksymvavilov commented Dec 15, 2023

maleck13 Jan 12, 2024

Choose a reason for hiding this comment

maleck13 Jan 12, 2024

Choose a reason for hiding this comment

mikenairn Jan 15, 2024

Choose a reason for hiding this comment

mikenairn Jan 23, 2024

Choose a reason for hiding this comment

maleck13 left a comment

Choose a reason for hiding this comment

philbrookes left a comment

Choose a reason for hiding this comment

openshift-ci bot commented Jan 23, 2024

mikenairn commented Dec 7, 2023 •

edited by maksymvavilov

Loading