Merge pull request #4017 from paulojmdias/feat/support_objectselector_rolloutoperator

[rollout-operator] Add support for objectSelector into webhooks

Author: tcp13equals2

charts/rollout-operator/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: rollout-operator
 description: "Grafana rollout-operator"
 type: application
-version: 0.37.1
+version: 0.38.0
 appVersion: v0.32.0
 home: https://github.com/grafana/rollout-operator
 kubeVersion: ^1.10.0-0

charts/rollout-operator/README.md

@@ -4,7 +4,7 @@ Helm chart for deploying [Grafana rollout-operator](https://github.com/grafana/r
 
 # rollout-operator
 
-![Version: 0.37.1](https://img.shields.io/badge/Version-0.37.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.32.0](https://img.shields.io/badge/AppVersion-v0.32.0-informational?style=flat-square)
+![Version: 0.38.0](https://img.shields.io/badge/Version-0.38.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.32.0](https://img.shields.io/badge/AppVersion-v0.32.0-informational?style=flat-square)
 
 Grafana rollout-operator
 
@@ -85,4 +85,5 @@ Manually applying these CRDs is only required if upgrading from a chart <= v0.32
 | tolerations | list | `[]` |  |
 | webhooks.enabled | bool | `true` | Enable the rollout-operator webhooks. See https://github.com/grafana/rollout-operator/#webhooks. Note that the webhooks require custom resource definitions. If upgrading, manually apply the files in the `crds` directory. |
 | webhooks.failurePolicy | string | `"Fail"` | Validating and mutating webhook failure policy. `Ignore` or `Fail`. |
+| webhooks.objectSelector | object | `{}` | objectSelector to filter which objects the webhooks apply to. |
 | webhooks.selfSignedCertSecretName | string | `"certificate"` | Secret resource name for the TLS certificate to be used with the webhooks |

charts/rollout-operator/templates/no-downscale-webhook.yaml

@@ -31,6 +31,10 @@ webhooks:
     namespaceSelector:
       matchLabels:
         kubernetes.io/metadata.name: {{ .Release.Namespace | quote }}
+    {{- with .Values.webhooks.objectSelector }}
+    objectSelector:
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
     sideEffects: None
     failurePolicy: {{.Values.webhooks.failurePolicy}}
 {{- end -}}

charts/rollout-operator/templates/pod-eviction-webhook.yaml

@@ -30,6 +30,10 @@ webhooks:
     namespaceSelector:
       matchLabels:
         kubernetes.io/metadata.name: {{ .Release.Namespace | quote }}
+    {{- with .Values.webhooks.objectSelector }}
+    objectSelector:
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
     sideEffects: None
     failurePolicy: {{.Values.webhooks.failurePolicy}}
 {{- end -}}

charts/rollout-operator/templates/prepare-downscale-webhook.yaml

@@ -31,6 +31,10 @@ webhooks:
     namespaceSelector:
       matchLabels:
         kubernetes.io/metadata.name: {{ .Release.Namespace | quote }}
+    {{- with .Values.webhooks.objectSelector }}
+    objectSelector:
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
     sideEffects: NoneOnDryRun
     matchPolicy: Equivalent
     timeoutSeconds: 10

charts/rollout-operator/templates/zone-aware-pod-disruption-budget-validating-webhook.yaml

@@ -30,6 +30,10 @@ webhooks:
     namespaceSelector:
       matchLabels:
         kubernetes.io/metadata.name: {{ .Release.Namespace | quote }}
+    {{- with .Values.webhooks.objectSelector }}
+    objectSelector:
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
     sideEffects: None
     failurePolicy: {{.Values.webhooks.failurePolicy}}
 {{- end -}}

charts/rollout-operator/values.yaml

@@ -108,3 +108,15 @@ webhooks:
   failurePolicy: "Fail"
   # -- Secret resource name for the TLS certificate to be used with the webhooks
   selfSignedCertSecretName: "certificate"
+  # -- objectSelector to filter which objects the webhooks apply to.
+  objectSelector: {}
+  # See https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/#matching-requests-objectselector
+  # Example:
+  #   objectSelector:
+  #     matchLabels:
+  #       app: loki
+  #     matchExpressions:
+  #       - key: environment
+  #         operator: In
+  #         values:
+  #           - production