From 4840cdcb664cd201ded5e2ae8c156651244972ef Mon Sep 17 00:00:00 2001
From: Paul Gier <pgier@redhat.com>
Date: Tue, 5 May 2020 14:13:46 -0500
Subject: [PATCH] Revert "Remove field preserveUnknownFields from CRDs"

This reverts commit cdaaf3d51c99a432726cd1ed20f5af01cbcd42d4.
---
 .../kube-prometheus/kube-prometheus.libsonnet | 33 +------------------
 ...0alertmanagerCustomResourceDefinition.yaml |  1 +
 ...r-0podmonitorCustomResourceDefinition.yaml |  1 +
 ...r-0prometheusCustomResourceDefinition.yaml |  1 +
 ...rometheusruleCustomResourceDefinition.yaml |  1 +
 ...ervicemonitorCustomResourceDefinition.yaml |  1 +
 ...-0thanosrulerCustomResourceDefinition.yaml |  1 +
 7 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/jsonnet/kube-prometheus/kube-prometheus.libsonnet b/jsonnet/kube-prometheus/kube-prometheus.libsonnet
index 92262460..2001cd0d 100644
--- a/jsonnet/kube-prometheus/kube-prometheus.libsonnet
+++ b/jsonnet/kube-prometheus/kube-prometheus.libsonnet
@@ -18,38 +18,7 @@ local configMapList = k3.core.v1.configMapList;
   kubePrometheus+:: {
     namespace: k.core.v1.namespace.new($._config.namespace),
   },
-  prometheusOperator+::
-  {
-    '0alertmanagerCustomResourceDefinition'+: {
-      spec: std.mergePatch(super.spec, {
-        preserveUnknownFields: null,
-      }),
-    },
-    '0prometheusCustomResourceDefinition'+: {
-      spec: std.mergePatch(super.spec, {
-        preserveUnknownFields: null,
-      }),
-    },
-    '0servicemonitorCustomResourceDefinition'+: {
-      spec: std.mergePatch(super.spec, {
-        preserveUnknownFields: null,
-      }),
-    },
-    '0podmonitorCustomResourceDefinition'+: {
-      spec: std.mergePatch(super.spec, {
-        preserveUnknownFields: null,
-      }),
-    },
-    '0prometheusruleCustomResourceDefinition'+: {
-      spec: std.mergePatch(super.spec, {
-        preserveUnknownFields: null,
-      }),
-    },
-    '0thanosrulerCustomResourceDefinition'+: {
-      spec: std.mergePatch(super.spec, {
-        preserveUnknownFields: null,
-      }),
-    },
+  prometheusOperator+:: {
     service+: {
       spec+: {
         ports: [
diff --git a/manifests/setup/prometheus-operator-0alertmanagerCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0alertmanagerCustomResourceDefinition.yaml
index fc186741..f761b9a4 100644
--- a/manifests/setup/prometheus-operator-0alertmanagerCustomResourceDefinition.yaml
+++ b/manifests/setup/prometheus-operator-0alertmanagerCustomResourceDefinition.yaml
@@ -24,6 +24,7 @@ spec:
     listKind: AlertmanagerList
     plural: alertmanagers
     singular: alertmanager
+  preserveUnknownFields: false
   scope: Namespaced
   subresources: {}
   validation:
diff --git a/manifests/setup/prometheus-operator-0podmonitorCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0podmonitorCustomResourceDefinition.yaml
index c60f902f..90d1964f 100644
--- a/manifests/setup/prometheus-operator-0podmonitorCustomResourceDefinition.yaml
+++ b/manifests/setup/prometheus-operator-0podmonitorCustomResourceDefinition.yaml
@@ -12,6 +12,7 @@ spec:
     listKind: PodMonitorList
     plural: podmonitors
     singular: podmonitor
+  preserveUnknownFields: false
   scope: Namespaced
   validation:
     openAPIV3Schema:
diff --git a/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml
index 7a3e2f96..a1109ae1 100644
--- a/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml
+++ b/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml
@@ -24,6 +24,7 @@ spec:
     listKind: PrometheusList
     plural: prometheuses
     singular: prometheus
+  preserveUnknownFields: false
   scope: Namespaced
   subresources: {}
   validation:
diff --git a/manifests/setup/prometheus-operator-0prometheusruleCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0prometheusruleCustomResourceDefinition.yaml
index 2a903bb5..fde0b0a9 100644
--- a/manifests/setup/prometheus-operator-0prometheusruleCustomResourceDefinition.yaml
+++ b/manifests/setup/prometheus-operator-0prometheusruleCustomResourceDefinition.yaml
@@ -12,6 +12,7 @@ spec:
     listKind: PrometheusRuleList
     plural: prometheusrules
     singular: prometheusrule
+  preserveUnknownFields: false
   scope: Namespaced
   validation:
     openAPIV3Schema:
diff --git a/manifests/setup/prometheus-operator-0servicemonitorCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0servicemonitorCustomResourceDefinition.yaml
index bb98a234..ce2d659e 100644
--- a/manifests/setup/prometheus-operator-0servicemonitorCustomResourceDefinition.yaml
+++ b/manifests/setup/prometheus-operator-0servicemonitorCustomResourceDefinition.yaml
@@ -12,6 +12,7 @@ spec:
     listKind: ServiceMonitorList
     plural: servicemonitors
     singular: servicemonitor
+  preserveUnknownFields: false
   scope: Namespaced
   validation:
     openAPIV3Schema:
diff --git a/manifests/setup/prometheus-operator-0thanosrulerCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0thanosrulerCustomResourceDefinition.yaml
index 5d630512..b344d6e6 100644
--- a/manifests/setup/prometheus-operator-0thanosrulerCustomResourceDefinition.yaml
+++ b/manifests/setup/prometheus-operator-0thanosrulerCustomResourceDefinition.yaml
@@ -12,6 +12,7 @@ spec:
     listKind: ThanosRulerList
     plural: thanosrulers
     singular: thanosruler
+  preserveUnknownFields: false
   scope: Namespaced
   validation:
     openAPIV3Schema:
-- 
GitLab