Merge branch 'open-cluster-management-io:main' into diagram

Author: jan-law

.github/workflows/fossa.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Run FOSSA Scan
         uses: fossas/fossa-action@v1

.github/workflows/go-postsubmit.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: images
         run: make build-images
       - name: push

.github/workflows/go-release.yml

@@ -19,7 +19,7 @@ jobs:
           echo "REPO_NAME=${REPO_NAME}" >> ${GITHUB_ENV}
           echo "IMAGE_PATH=quay.io/open-cluster-management/${REPO_NAME}:${TAG}" >> ${GITHUB_ENV}
       - name: checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: build images
         run:  |
           make build-images

.github/workflows/kind.yml

@@ -23,10 +23,10 @@ jobs:
       REGISTRY: localhost:5000
     steps:
       - name: Checkout Config Policy Controller
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version-file: go.mod
 
@@ -94,10 +94,10 @@ jobs:
           - "latest"
     steps:
       - name: Checkout Config Policy Controller
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version-file: go.mod
 
@@ -146,10 +146,10 @@ jobs:
           - "latest"
     steps:
       - name: Checkout Config Policy Controller
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version-file: go.mod
 
@@ -199,10 +199,10 @@ jobs:
           - "latest"
     steps:
       - name: Checkout Config Policy Controller
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version-file: go.mod
 
@@ -245,15 +245,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Config Policy Controller
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: 'stable'
 
       - name: Download Coverage Results
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           merge-multiple: true
 

.gitignore

@@ -88,7 +88,7 @@ test/crds/test-policy.yaml
 !vbh/.build-harness-vendorized
 !vbh/build-harness
 !vbh/build-harness-extensions 
-kubeconfig_managed*
+kubeconfig_*
 kind_kubeconfig.yaml
 report.json
 report_*.json

Makefile

@@ -18,8 +18,6 @@ LOCAL_BIN ?= $(PWD)/bin
 export PATH := $(LOCAL_BIN):$(PATH)
 GOARCH = $(shell go env GOARCH)
 GOOS = $(shell go env GOOS)
-TESTARGS_DEFAULT := -v
-TESTARGS ?= $(TESTARGS_DEFAULT)
 CONTROLLER_NAME = $(shell cat COMPONENT_NAME 2> /dev/null)
 # Handle KinD configuration
 MANAGED_CLUSTER_SUFFIX ?= 

api/v1/configurationpolicy_types.go

@@ -417,6 +417,11 @@ type ObjectProperties struct {
 	// Diff stores the difference between the `objectDefinition` in the policy and the object on the
 	// cluster.
 	Diff string `json:"diff,omitempty"`
+
+	// MatchesAfterDryRun indicates whether the object matches the policy after the dry run update. If true,
+	// there was an initial mismatch between the policy and object, but the dry run update produced
+	// a compliant result.
+	MatchesAfterDryRun bool `json:"matchesAfterDryRun,omitempty"`
 }
 
 // RelatedObject contains the details of an object matched by the policy.
@@ -452,6 +457,16 @@ type ConfigurationPolicyStatus struct {
 	// RelatedObjects is a list of objects processed by the configuration policy due to its
 	// `object-templates`.
 	RelatedObjects []RelatedObject `json:"relatedObjects,omitempty"`
+
+	// History is a list of the most recent compliance messages for this configuration policy.
+	// The first entry is the most recent, and the list is limited to 10 entries.
+	History []HistoryEvent `json:"history,omitempty"`
+}
+
+// HistoryEvent is a timestamped message representing the policy compliance state at that time.
+type HistoryEvent struct {
+	LastTimestamp metav1.MicroTime `json:"lastTimestamp,omitempty"`
+	Message       string           `json:"message,omitempty"`
 }
 
 func (c ConfigurationPolicy) ObjectIdentifier() depclient.ObjectIdentifier {

api/v1/zz_generated.deepcopy.go

@@ -242,6 +242,10 @@ type OperatorPolicyStatus struct {
 	// policy is waiting for OLM to resolve the situation. If in the recent past,
 	// the policy may update the status of the Subscription.
 	SubscriptionInterventionTime *metav1.Time `json:"subscriptionInterventionTime,omitempty"`
+
+	// History is a list of the most recent compliance messages for this operator policy.
+	// The first entry is the most recent, and the list is limited to 10 entries.
+	History []policyv1.HistoryEvent `json:"history,omitempty"`
 }
 
 // RelatedObjsOfKind iterates over the related objects in the status and returns a map of the index