Merge pull request #519 from pgier/dont-remove-preserve-unknown-fields

Revert "Remove field preserveUnknownFields from CRDs"

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+::
+  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,
-      }),
-    },
     service+: {
       spec+: {
         ports: [

manifests/setup/prometheus-operator-0alertmanagerCustomResourceDefinition.yaml

@@ -12,6 +12,7 @@ spec:
     listKind: AlertmanagerList
     plural: alertmanagers
     singular: alertmanager
+  preserveUnknownFields: false
   scope: Namespaced
   versions:
   - additionalPrinterColumns:

manifests/setup/prometheus-operator-0podmonitorCustomResourceDefinition.yaml

@@ -12,6 +12,7 @@ spec:
     listKind: PodMonitorList
     plural: podmonitors
     singular: podmonitor
+  preserveUnknownFields: false
   scope: Namespaced
   versions:
   - name: v1

manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml

@@ -12,6 +12,7 @@ spec:
     listKind: PrometheusList
     plural: prometheuses
     singular: prometheus
+  preserveUnknownFields: false
   scope: Namespaced
   versions:
   - additionalPrinterColumns:

manifests/setup/prometheus-operator-0prometheusruleCustomResourceDefinition.yaml

@@ -12,6 +12,7 @@ spec:
     listKind: PrometheusRuleList
     plural: prometheusrules
     singular: prometheusrule
+  preserveUnknownFields: false
   scope: Namespaced
   versions:
   - name: v1

manifests/setup/prometheus-operator-0servicemonitorCustomResourceDefinition.yaml

@@ -12,6 +12,7 @@ spec:
     listKind: ServiceMonitorList
     plural: servicemonitors
     singular: servicemonitor
+  preserveUnknownFields: false
   scope: Namespaced
   versions:
   - name: v1

manifests/setup/prometheus-operator-0thanosrulerCustomResourceDefinition.yaml

@@ -12,6 +12,7 @@ spec:
     listKind: ThanosRulerList
     plural: thanosrulers
     singular: thanosruler
+  preserveUnknownFields: false
   scope: Namespaced
   versions:
   - name: v1