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.

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

🤖 Sync from open-cluster-management-io/config-policy-controller: #264 #900

Merged
merged 2 commits into from
Jun 10, 2024
Merged

🤖 Sync from open-cluster-management-io/config-policy-controller: #264 #900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1690c7
Limit overlap detection to the same cluster
JustinKuli Jun 10, 2024
3e92860
Stop subscription intervention if CSV already set
JustinKuli Jun 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions controllers/operatorpolicy_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ const (
olmGracePeriod = 30 * time.Second
ManagedByLabel string = "operatorpolicy.policy.open-cluster-management.io/managed"
ManagedByAnnotation string = ManagedByLabel
ClusterNameLabel string = "policy.open-cluster-management.io/cluster-name"
ClusterNamespaceLabel string = "policy.open-cluster-management.io/cluster-namespace"
)

var (
Expand Down Expand Up @@ -476,8 +478,15 @@ func (r *OperatorPolicyReconciler) checkSubOverlap(
return statusChanged, nil, nil
}

// limit to OperatorPolicies for the same cluster as the policy
// (this cluster might be hosting OperatorPolicies for other clusters)
sel := labels.SelectorFromSet(map[string]string{
ClusterNameLabel: policy.GetLabels()[ClusterNameLabel],
ClusterNamespaceLabel: policy.GetLabels()[ClusterNamespaceLabel],
})

opList := &policyv1beta1.OperatorPolicyList{}
if err := r.List(ctx, opList); err != nil {
if err := r.List(ctx, opList, &client.ListOptions{LabelSelector: sel}); err != nil {
return statusChanged, nil, err
}

Expand Down Expand Up @@ -1310,6 +1319,12 @@ func (r *OperatorPolicyReconciler) considerResolutionFailed(

// Do the "intervention"

if mergedSub.Status.InstalledCSV != "" || mergedSub.Status.CurrentCSV != "" {
opLog.Info("The subscription already points to a CSV, not intervening", "currentSub", mergedSub)

return mergedSub, nil, changed, nil
}

watcher := opPolIdentifier(policy.Namespace, policy.Name)

existingCSV, err := r.DynamicWatcher.Get(watcher, clusterServiceVersionGVK, mergedSub.Namespace, unrefCSVMatches[1])
Expand All @@ -1335,14 +1350,15 @@ func (r *OperatorPolicyReconciler) considerResolutionFailed(
return mergedSub, nil, changed, nil
}

opLog.Info("Updating Subscription status to point to CSV",
"csvName", existingCSV.GetName(), "currentSub", mergedSub)

if mergedSub.Status.LastUpdated.IsZero() {
mergedSub.Status.LastUpdated = metav1.Now()
}

mergedSub.Status.CurrentCSV = existingCSV.GetName()

opLog.Info("Updating Subscription status to point to CSV", "csvName", existingCSV.GetName())

if err := r.TargetClient.Status().Update(ctx, mergedSub); err != nil {
return mergedSub, nil, changed,
fmt.Errorf("error updating the Subscription status to point to the CSV: %w", err)
Expand Down
3 changes: 3 additions & 0 deletions test/resources/case38_operator_install/operator-policy-all-defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ metadata:
annotations:
policy.open-cluster-management.io/parent-policy-compliance-db-id: "124"
policy.open-cluster-management.io/policy-compliance-db-id: "64"
labels:
policy.open-cluster-management.io/cluster-name: "managed"
policy.open-cluster-management.io/cluster-namespace: "managed"
ownerReferences:
- apiVersion: policy.open-cluster-management.io/v1
kind: Policy
Expand Down
3 changes: 3 additions & 0 deletions test/resources/case38_operator_install/operator-policy-argocd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ metadata:
annotations:
policy.open-cluster-management.io/parent-policy-compliance-db-id: "124"
policy.open-cluster-management.io/policy-compliance-db-id: "64"
labels:
policy.open-cluster-management.io/cluster-name: "managed"
policy.open-cluster-management.io/cluster-namespace: "managed"
ownerReferences:
- apiVersion: policy.open-cluster-management.io/v1
kind: Policy
Expand Down
3 changes: 3 additions & 0 deletions test/resources/case38_operator_install/operator-policy-authorino.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ metadata:
annotations:
policy.open-cluster-management.io/parent-policy-compliance-db-id: "124"
policy.open-cluster-management.io/policy-compliance-db-id: "64"
labels:
policy.open-cluster-management.io/cluster-name: "managed"
policy.open-cluster-management.io/cluster-namespace: "managed"
ownerReferences:
- apiVersion: policy.open-cluster-management.io/v1
kind: Policy
Expand Down
3 changes: 3 additions & 0 deletions test/resources/case38_operator_install/operator-policy-defaults-invalid-source.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ metadata:
annotations:
policy.open-cluster-management.io/parent-policy-compliance-db-id: "124"
policy.open-cluster-management.io/policy-compliance-db-id: "64"
labels:
policy.open-cluster-management.io/cluster-name: "managed"
policy.open-cluster-management.io/cluster-namespace: "managed"
ownerReferences:
- apiVersion: policy.open-cluster-management.io/v1
kind: Policy
Expand Down
3 changes: 3 additions & 0 deletions test/resources/case38_operator_install/operator-policy-manual-upgrades.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ metadata:
annotations:
policy.open-cluster-management.io/parent-policy-compliance-db-id: "124"
policy.open-cluster-management.io/policy-compliance-db-id: "64"
labels:
policy.open-cluster-management.io/cluster-name: "managed"
policy.open-cluster-management.io/cluster-namespace: "managed"
ownerReferences:
- apiVersion: policy.open-cluster-management.io/v1
kind: Policy
Expand Down
3 changes: 3 additions & 0 deletions test/resources/case38_operator_install/operator-policy-mustnothave-any-version.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ metadata:
annotations:
policy.open-cluster-management.io/parent-policy-compliance-db-id: "124"
policy.open-cluster-management.io/policy-compliance-db-id: "64"
labels:
policy.open-cluster-management.io/cluster-name: "managed"
policy.open-cluster-management.io/cluster-namespace: "managed"
ownerReferences:
- apiVersion: policy.open-cluster-management.io/v1
kind: Policy
Expand Down
3 changes: 3 additions & 0 deletions test/resources/case38_operator_install/operator-policy-mustnothave.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ metadata:
annotations:
policy.open-cluster-management.io/parent-policy-compliance-db-id: "124"
policy.open-cluster-management.io/policy-compliance-db-id: "64"
labels:
policy.open-cluster-management.io/cluster-name: "managed"
policy.open-cluster-management.io/cluster-namespace: "managed"
ownerReferences:
- apiVersion: policy.open-cluster-management.io/v1
kind: Policy
Expand Down
3 changes: 3 additions & 0 deletions test/resources/case38_operator_install/operator-policy-no-exist-enforce.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ metadata:
annotations:
policy.open-cluster-management.io/parent-policy-compliance-db-id: "124"
policy.open-cluster-management.io/policy-compliance-db-id: "64"
labels:
policy.open-cluster-management.io/cluster-name: "managed"
policy.open-cluster-management.io/cluster-namespace: "managed"
ownerReferences:
- apiVersion: policy.open-cluster-management.io/v1
kind: Policy
Expand Down
3 changes: 3 additions & 0 deletions test/resources/case38_operator_install/operator-policy-no-group-csv-fail.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ metadata:
annotations:
policy.open-cluster-management.io/parent-policy-compliance-db-id: "124"
policy.open-cluster-management.io/policy-compliance-db-id: "64"
labels:
policy.open-cluster-management.io/cluster-name: "managed"
policy.open-cluster-management.io/cluster-namespace: "managed"
ownerReferences:
- apiVersion: policy.open-cluster-management.io/v1
kind: Policy
Expand Down
3 changes: 3 additions & 0 deletions test/resources/case38_operator_install/operator-policy-no-group-enforce-one-version.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ metadata:
annotations:
policy.open-cluster-management.io/parent-policy-compliance-db-id: "124"
policy.open-cluster-management.io/policy-compliance-db-id: "64"
labels:
policy.open-cluster-management.io/cluster-name: "managed"
policy.open-cluster-management.io/cluster-namespace: "managed"
ownerReferences:
- apiVersion: policy.open-cluster-management.io/v1
kind: Policy
Expand Down
3 changes: 3 additions & 0 deletions test/resources/case38_operator_install/operator-policy-no-group-enforce.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ metadata:
annotations:
policy.open-cluster-management.io/parent-policy-compliance-db-id: "124"
policy.open-cluster-management.io/policy-compliance-db-id: "64"
labels:
policy.open-cluster-management.io/cluster-name: "managed"
policy.open-cluster-management.io/cluster-namespace: "managed"
ownerReferences:
- apiVersion: policy.open-cluster-management.io/v1
kind: Policy
Expand Down
3 changes: 3 additions & 0 deletions test/resources/case38_operator_install/operator-policy-no-group-one-version.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ metadata:
annotations:
policy.open-cluster-management.io/parent-policy-compliance-db-id: "124"
policy.open-cluster-management.io/policy-compliance-db-id: "64"
labels:
policy.open-cluster-management.io/cluster-name: "managed"
policy.open-cluster-management.io/cluster-namespace: "managed"
ownerReferences:
- apiVersion: policy.open-cluster-management.io/v1
kind: Policy
Expand Down
3 changes: 3 additions & 0 deletions test/resources/case38_operator_install/operator-policy-no-group.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ metadata:
annotations:
policy.open-cluster-management.io/parent-policy-compliance-db-id: "124"
policy.open-cluster-management.io/policy-compliance-db-id: "64"
labels:
policy.open-cluster-management.io/cluster-name: "managed"
policy.open-cluster-management.io/cluster-namespace: "managed"
ownerReferences:
- apiVersion: policy.open-cluster-management.io/v1
kind: Policy
Expand Down
3 changes: 3 additions & 0 deletions test/resources/case38_operator_install/operator-policy-strimzi-kafka-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ metadata:
annotations:
policy.open-cluster-management.io/parent-policy-compliance-db-id: "124"
policy.open-cluster-management.io/policy-compliance-db-id: "64"
labels:
policy.open-cluster-management.io/cluster-name: "managed"
policy.open-cluster-management.io/cluster-namespace: "managed"
ownerReferences:
- apiVersion: policy.open-cluster-management.io/v1
kind: Policy
Expand Down
3 changes: 3 additions & 0 deletions test/resources/case38_operator_install/operator-policy-validity-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ metadata:
annotations:
policy.open-cluster-management.io/parent-policy-compliance-db-id: "124"
policy.open-cluster-management.io/policy-compliance-db-id: "64"
labels:
policy.open-cluster-management.io/cluster-name: "managed"
policy.open-cluster-management.io/cluster-namespace: "managed"
ownerReferences:
- apiVersion: policy.open-cluster-management.io/v1
kind: Policy
Expand Down
3 changes: 3 additions & 0 deletions test/resources/case38_operator_install/operator-policy-with-group.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ metadata:
annotations:
policy.open-cluster-management.io/parent-policy-compliance-db-id: "124"
policy.open-cluster-management.io/policy-compliance-db-id: "64"
labels:
policy.open-cluster-management.io/cluster-name: "managed"
policy.open-cluster-management.io/cluster-namespace: "managed"
ownerReferences:
- apiVersion: policy.open-cluster-management.io/v1
kind: Policy
Expand Down
3 changes: 3 additions & 0 deletions test/resources/case38_operator_install/operator-policy-with-templates.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ metadata:
annotations:
policy.open-cluster-management.io/parent-policy-compliance-db-id: "124"
policy.open-cluster-management.io/policy-compliance-db-id: "64"
labels:
policy.open-cluster-management.io/cluster-name: "managed"
policy.open-cluster-management.io/cluster-namespace: "managed"
ownerReferences:
- apiVersion: policy.open-cluster-management.io/v1
kind: Policy
Expand Down