INSIGHTS-547 - Add OPA v1 deprecation log to insights agent (#985)

* INSIGHTS-547 Add OPA v1 deprecation log to insights agent * INSIGHTS-547 Add OPA v1 deprecation log to insights agent * INSIGHTS-547 Add OPA v1 deprecation log to insights agent
FairwindsOps · Dec 11, 2024 · d14f77f · d14f77f
1 parent d06a52e
commit d14f77f
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 4 deletions.
diff --git a/fairwinds-insights.yaml b/fairwinds-insights.yaml
@@ -8,7 +8,7 @@ images:
     - quay.io/fairwinds/nova:v3.11
     - us-docker.pkg.dev/fairwinds-ops/oss/pluto:v5.20
     - us-docker.pkg.dev/fairwinds-ops/oss/goldilocks:v4.13
-    - quay.io/fairwinds/insights-admission-controller:1.17.7
+    - quay.io/fairwinds/insights-admission-controller:1.17.8
     - quay.io/fairwinds/aws-costs:1.4.2
     - quay.io/fairwinds/insights-ci:5.7.14
     - quay.io/fairwinds/cloud-costs:0.3.11
@@ -18,7 +18,7 @@ images:
     - quay.io/fairwinds/kubectl:0.20.8
     - quay.io/fairwinds/fw-kubesec:1.4.12
     - quay.io/fairwinds/kyverno:0.3.3
-    - quay.io/fairwinds/fw-opa:2.5.5
+    - quay.io/fairwinds/fw-opa:2.5.6
     - quay.io/fairwinds/postgres-partman:16.0.1
     - quay.io/fairwinds/prometheus-collector:1.5.6
     - quay.io/fairwinds/rbac-reporter:1.3.22

diff --git a/plugins/admission/CHANGELOG.md b/plugins/admission/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.17.8
+* OPA v1 deprecation message
+
 ## 1.17.7
 * bumped alpine to 3.21
 

diff --git a/plugins/admission/pkg/opa/opa.go b/plugins/admission/pkg/opa/opa.go
@@ -30,10 +30,12 @@ func ProcessOPA(ctx context.Context, obj map[string]any, req admission.Request,
 
 	opaCustomChecks, opaCustomLibs := opa.GetOPACustomChecksAndLibraries(configuration.OPA.CustomChecks)
 	logrus.Infof("Found %d checks, %d instances and %d libs", len(opaCustomChecks), len(configuration.OPA.CustomCheckInstances), len(opaCustomLibs))
+	anyChekIsV1 := false
 	for _, check := range opaCustomChecks {
 		logrus.Debugf("Check %s is version %.1f\n", check.Name, check.Version)
 		switch check.Version {
 		case 1.0:
+			anyChekIsV1 = true
 			newActionItems, err := ProcessOPAV1(ctx, obj, req.AdmissionRequest.Name, req.AdmissionRequest.RequestKind.Group, req.AdmissionRequest.RequestKind.Kind, req.AdmissionRequest.Namespace, check, configuration.OPA.CustomCheckInstances, &requestInfo)
 			actionItems = append(actionItems, newActionItems...)
 			if err != nil {
@@ -49,6 +51,9 @@ func ProcessOPA(ctx context.Context, obj map[string]any, req admission.Request,
 			allErrs = multierror.Append(allErrs, fmt.Errorf("CustomCheck %s is an unexpected version %.1f and will not be run - this could cause admission control to be blocked", check.Name, check.Version))
 		}
 	}
+	if anyChekIsV1 {
+		logrus.Info("OPA v1 will be deprecated after Mar 31, 2025. Visit: https://insights.docs.fairwinds.com/features/insights-cli/#opa-v1-deprecation for more information.")
+	}
 	results := map[string]any{
 		"ActionItems": actionItems,
 	}

diff --git a/plugins/admission/version.txt b/plugins/admission/version.txt
@@ -1 +1 @@
-1.17.7
+1.17.8
diff --git a/plugins/opa/CHANGELOG.md b/plugins/opa/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 2.5.6
+* OPA v1 deprecation message
+
 ## 2.5.5
 * bumped alpine to 3.21
 

diff --git a/plugins/opa/pkg/opa/opa.go b/plugins/opa/pkg/opa/opa.go
@@ -52,10 +52,12 @@ func processAllChecks(ctx context.Context, checkInstances []CheckSetting, checks
 
 	opaCustomChecks, opaCustomLibs := GetOPACustomChecksAndLibraries(checksAndLibs)
 	logrus.Infof("Found %d checks, %d instances and %d libs", len(opaCustomChecks), len(checkInstances), len(opaCustomLibs))
+	anyChekIsV1 := false
 	for _, check := range opaCustomChecks {
 		logrus.Debugf("Check %s is version %.1f", check.Name, check.Version)
 		switch check.Version {
 		case 1.0:
+			anyChekIsV1 = true
 			for _, checkInstance := range checkInstances {
 				if check.Name == checkInstance.CheckName {
 					logrus.Debugf("Found instance %s to match check %s", checkInstance.AdditionalData.Name, check.Name)
@@ -78,6 +80,9 @@ func processAllChecks(ctx context.Context, checkInstances []CheckSetting, checks
 			allErrs = multierror.Append(allErrs, fmt.Errorf("CustomCheck %s is an unexpected version %.1f and will not be run", check.Name, check.Version))
 		}
 	}
+	if anyChekIsV1 {
+		logrus.Info("OPA v1 will be deprecated after Mar 31, 2025. Visit: https://insights.docs.fairwinds.com/features/insights-cli/#opa-v1-deprecation for more information.")
+	}
 	return actionItems, allErrs
 }
 

diff --git a/plugins/opa/version.txt b/plugins/opa/version.txt
@@ -1 +1 @@
-2.5.5
+2.5.6