Merge branch 'master' into edp

open-policy-agent · Aug 19, 2021 · f7d1668 · f7d1668
2 parents dacdce8 + 0238780
commit f7d1668
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/cmd/build/helmify/main.go b/cmd/build/helmify/main.go
@@ -117,6 +117,10 @@ func (ks *kindSet) Write() error {
 				obj = strings.Replace(obj, "      labels:", "      labels:\n{{- include \"gatekeeper.podLabels\" . }}", 1)
 			}
 
+			if name == "gatekeeper-controller-manager" && kind == "PodDisruptionBudget" {
+				obj = strings.Replace(obj, "apiVersion: policy/v1beta1", "{{- if .Capabilities.APIVersions.Has \"policy/v1\" }}\napiVersion: policy/v1\n{{ else }}\napiVersion: policy/v1beta1\n{{ end -}}", 1)
+			}
+
 			if err := os.WriteFile(destFile, []byte(obj), 0600); err != nil {
 				return err
 			}

diff --git a/...taging/charts/gatekeeper/templates/gatekeeper-controller-manager-poddisruptionbudget.yaml b/...taging/charts/gatekeeper/templates/gatekeeper-controller-manager-poddisruptionbudget.yaml
@@ -1,4 +1,8 @@
+{{- if .Capabilities.APIVersions.Has "policy/v1" }}
+apiVersion: policy/v1
+{{ else }}
 apiVersion: policy/v1beta1
+{{ end -}}
 kind: PodDisruptionBudget
 metadata:
   labels:

diff --git a/pkg/webhook/stats_reporter.go b/pkg/webhook/stats_reporter.go
@@ -87,7 +87,7 @@ func register() error {
 			Name:        validationRequestDurationMetricName,
 			Description: validationResponseTimeInSecM.Description(),
 			Measure:     validationResponseTimeInSecM,
-			Aggregation: view.Distribution(0.001, 0.002, 0.003, 0.004, 0.005, 0.006, 0.007, 0.008, 0.009, 0.01, 0.02, 0.03, 0.04, 0.05),
+			Aggregation: view.Distribution(0.001, 0.002, 0.003, 0.004, 0.005, 0.006, 0.007, 0.008, 0.009, 0.01, 0.02, 0.03, 0.04, 0.05, 0.06, 0.07, 0.08, 0.09, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1, 1.5, 2, 2.5, 3),
 			TagKeys:     []tag.Key{admissionStatusKey},
 		},
 		{
@@ -101,8 +101,7 @@ func register() error {
 			Name:        mutationRequestDurationMetricName,
 			Description: mutationResponseTimeInSecM.Description(),
 			Measure:     mutationResponseTimeInSecM,
-			// TODO: Adjust the distribution once we know what value make sense here
-			Aggregation: view.Distribution(0.001, 0.002, 0.003, 0.004, 0.005, 0.006, 0.007, 0.008, 0.009, 0.01, 0.02, 0.03, 0.04, 0.05),
+			Aggregation: view.Distribution(0.001, 0.002, 0.003, 0.004, 0.005, 0.006, 0.007, 0.008, 0.009, 0.01, 0.02, 0.03, 0.04, 0.05, 0.06, 0.07, 0.08, 0.09, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1, 1.5, 2, 2.5, 3),
 			TagKeys:     []tag.Key{mutationStatusKey},
 		},
 	}