JaydipGabani · JaydipGabani · Sep 12, 2024 · Sep 12, 2024
diff --git a/Makefile b/Makefile
@@ -16,7 +16,7 @@ LOG_LEVEL ?= "INFO"
 GENERATE_VAP ?= false
 GENERATE_VAPBINDING ?= false
 
-VERSION := v3.18.0-beta.0
+VERSION := v3.18.0
 
 KIND_VERSION ?= 0.17.0
 KIND_CLUSTER_FILE ?= test/bats/tests/kindcluster.yml

diff --git a/charts/gatekeeper/Chart.yaml b/charts/gatekeeper/Chart.yaml
@@ -4,8 +4,8 @@ name: gatekeeper
 icon: https://open-policy-agent.github.io/gatekeeper/website/img/logo.svg
 keywords:
   - open policy agent
-version: 3.18.0-beta.0
+version: 3.18.0
 home: https://github.com/open-policy-agent/gatekeeper
 sources:
   - https://github.com/open-policy-agent/gatekeeper.git
-appVersion: v3.18.0-beta.0
+appVersion: v3.18.0
diff --git a/charts/gatekeeper/README.md b/charts/gatekeeper/README.md
diff --git a/charts/gatekeeper/templates/gatekeeper-audit-deployment.yaml b/charts/gatekeeper/templates/gatekeeper-audit-deployment.yaml
@@ -65,6 +65,7 @@ spec:
         - --audit-chunk-size={{ .Values.auditChunkSize }}
         - --audit-match-kind-only={{ .Values.auditMatchKindOnly }}
         - --emit-audit-events={{ .Values.emitAuditEvents }}
+        - --log-stats-audit={{ .Values.logStatsAudit }}
         - --audit-events-involved-namespace={{ .Values.auditEventsInvolvedNamespace }}
         - --operation=audit
         - --operation=status

diff --git a/charts/gatekeeper/templates/gatekeeper-controller-manager-deployment.yaml b/charts/gatekeeper/templates/gatekeeper-controller-manager-deployment.yaml
@@ -64,6 +64,7 @@ spec:
         - --logtostderr
         - --log-denies={{ .Values.logDenies }}
         - --emit-admission-events={{ .Values.emitAdmissionEvents }}
+        - --log-stats-admission={{ .Values.logStatsAdmission }}
         - --admission-events-involved-namespace={{ .Values.admissionEventsInvolvedNamespace }}
         - --log-level={{ (.Values.controllerManager.logLevel | empty | not) | ternary .Values.controllerManager.logLevel .Values.logLevel }}
         - --exempt-namespace={{ .Release.Namespace }}

diff --git a/charts/gatekeeper/templates/gatekeeper-controller-manager-poddisruptionbudget.yaml b/charts/gatekeeper/templates/gatekeeper-controller-manager-poddisruptionbudget.yaml
@@ -1,6 +1,6 @@
 ---
-{{- $v1 := .Capabilities.APIVersions.Has "policy/v1/PodDisruptionBudget" -}}
-{{- $v1beta1 := .Capabilities.APIVersions.Has "policy/v1beta1/PodDisruptionBudget" -}}
+{{ $v1 := .Capabilities.APIVersions.Has "policy/v1/PodDisruptionBudget" -}}
+{{ $v1beta1 := .Capabilities.APIVersions.Has "policy/v1beta1/PodDisruptionBudget" -}}
 apiVersion: policy/v1{{- if and (not $v1) $v1beta1 -}}beta1{{- end }}
 kind: PodDisruptionBudget
 metadata:

diff --git a/charts/gatekeeper/values.yaml b/charts/gatekeeper/values.yaml
@@ -39,6 +39,8 @@ auditChunkSize: 500
 logLevel: INFO
 logDenies: false
 logMutations: false
+logStatsAdmission: false
+logStatsAudit: false
 emitAdmissionEvents: false
 emitAuditEvents: false
 admissionEventsInvolvedNamespace: false
@@ -49,14 +51,14 @@ enableK8sNativeValidation: true
 image:
   repository: openpolicyagent/gatekeeper
   crdRepository: openpolicyagent/gatekeeper-crds
-  release: v3.18.0-beta.0
+  release: v3.18.0
   pullPolicy: IfNotPresent
   pullSecrets: []
 preInstall:
   crdRepository:
     image:
       repository: null
-      tag: v3.18.0-beta.0
+      tag: v3.18.0
 postUpgrade:
   labelNamespace:
     serviceAccount:
@@ -65,7 +67,7 @@ postUpgrade:
     enabled: false
     image:
       repository: openpolicyagent/gatekeeper-crds
-      tag: v3.18.0-beta.0
+      tag: v3.18.0
       pullPolicy: IfNotPresent
       pullSecrets: []
     extraNamespaces: []
@@ -99,7 +101,7 @@ postInstall:
     extraRules: []
     image:
       repository: openpolicyagent/gatekeeper-crds
-      tag: v3.18.0-beta.0
+      tag: v3.18.0
       pullPolicy: IfNotPresent
       pullSecrets: []
     extraNamespaces: []
@@ -143,7 +145,7 @@ preUninstall:
     enabled: false
     image:
       repository: openpolicyagent/gatekeeper-crds
-      tag: v3.18.0-beta.0
+      tag: v3.18.0
       pullPolicy: IfNotPresent
       pullSecrets: []
     priorityClassName: ""

diff --git a/cmd/build/helmify/static/Chart.yaml b/cmd/build/helmify/static/Chart.yaml
@@ -4,8 +4,8 @@ name: gatekeeper
 icon: https://open-policy-agent.github.io/gatekeeper/website/img/logo.svg
 keywords:
   - open policy agent
-version: 3.18.0-beta.0
+version: 3.18.0
 home: https://github.com/open-policy-agent/gatekeeper
 sources:
   - https://github.com/open-policy-agent/gatekeeper.git
-appVersion: v3.18.0-beta.0
+appVersion: v3.18.0
diff --git a/cmd/build/helmify/static/README.md b/cmd/build/helmify/static/README.md
diff --git a/cmd/build/helmify/static/values.yaml b/cmd/build/helmify/static/values.yaml
@@ -51,14 +51,14 @@ enableK8sNativeValidation: true
 image:
   repository: openpolicyagent/gatekeeper
   crdRepository: openpolicyagent/gatekeeper-crds
-  release: v3.18.0-beta.0
+  release: v3.18.0
   pullPolicy: IfNotPresent
   pullSecrets: []
 preInstall:
   crdRepository:
     image:
       repository: null
-      tag: v3.18.0-beta.0
+      tag: v3.18.0
 postUpgrade:
   labelNamespace:
     serviceAccount:
@@ -67,7 +67,7 @@ postUpgrade:
     enabled: false
     image:
       repository: openpolicyagent/gatekeeper-crds
-      tag: v3.18.0-beta.0
+      tag: v3.18.0
       pullPolicy: IfNotPresent
       pullSecrets: []
     extraNamespaces: []
@@ -101,7 +101,7 @@ postInstall:
     extraRules: []
     image:
       repository: openpolicyagent/gatekeeper-crds
-      tag: v3.18.0-beta.0
+      tag: v3.18.0
       pullPolicy: IfNotPresent
       pullSecrets: []
     extraNamespaces: []
@@ -145,7 +145,7 @@ preUninstall:
     enabled: false
     image:
       repository: openpolicyagent/gatekeeper-crds
-      tag: v3.18.0-beta.0
+      tag: v3.18.0
       pullPolicy: IfNotPresent
       pullSecrets: []
     priorityClassName: ""

diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -56,7 +56,7 @@ spec:
             - "--operation=webhook"
             - "--operation=mutation-webhook"
             - "--disable-opa-builtin={http.send}"
-          image: openpolicyagent/gatekeeper:v3.18.0-beta.0
+          image: openpolicyagent/gatekeeper:v3.18.0
           imagePullPolicy: Always
           name: manager
           ports:
@@ -150,7 +150,7 @@ spec:
             - --disable-cert-rotation
           command:
             - /manager
-          image: openpolicyagent/gatekeeper:v3.18.0-beta.0
+          image: openpolicyagent/gatekeeper:v3.18.0
           env:
             # used by Gatekeeper
             - name: POD_NAMESPACE

diff --git a/deploy/gatekeeper.yaml b/deploy/gatekeeper.yaml
@@ -4961,7 +4961,7 @@ spec:
           value: manager
         - name: OTEL_RESOURCE_ATTRIBUTES
           value: k8s.pod.name=$(POD_NAME),k8s.namespace.name=$(NAMESPACE),k8s.container.name=$(CONTAINER_NAME)
-        image: openpolicyagent/gatekeeper:v3.18.0-beta.0
+        image: openpolicyagent/gatekeeper:v3.18.0
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -5080,7 +5080,7 @@ spec:
           value: manager
         - name: OTEL_RESOURCE_ATTRIBUTES
           value: k8s.pod.name=$(POD_NAME),k8s.namespace.name=$(NAMESPACE),k8s.container.name=$(CONTAINER_NAME)
-        image: openpolicyagent/gatekeeper:v3.18.0-beta.0
+        image: openpolicyagent/gatekeeper:v3.18.0
         imagePullPolicy: Always
         livenessProbe:
           httpGet:

diff --git a/manifest_staging/charts/gatekeeper/Chart.yaml b/manifest_staging/charts/gatekeeper/Chart.yaml
@@ -4,8 +4,8 @@ name: gatekeeper
 icon: https://open-policy-agent.github.io/gatekeeper/website/img/logo.svg
 keywords:
   - open policy agent
-version: 3.18.0-beta.0
+version: 3.18.0
 home: https://github.com/open-policy-agent/gatekeeper
 sources:
   - https://github.com/open-policy-agent/gatekeeper.git
-appVersion: v3.18.0-beta.0
+appVersion: v3.18.0