diff --git a/jsonnet/kube-prometheus/kube-prometheus.libsonnet b/jsonnet/kube-prometheus/kube-prometheus.libsonnet index 92262460c79480f5d916aadb8da6feca5c01d1a8..2001cd0d17331520391b0bfea12c56138a00341e 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 fc1867415c64447d06cdd997a80ab68eaa9a3a9b..f761b9a49720ebe424e3d80c6237fd256726e9f3 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 c60f902f361b59030c21d02c952e51620cee00a4..90d1964fa5ac0b81df36984b910aaec8db3984e1 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 7a3e2f961d963c74f23f2af996c1158949860f80..a1109ae1758cc715a1d79e775a28cc33ff07ac34 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 2a903bb5fdf214562c7cab8024b71321f1784b50..fde0b0a9cb2f241840b6456e917656e3a02c2a78 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 bb98a234ce04f3fb41d3ee49213a6efa09865963..ce2d659e9e228b441e2489f68fdbfd12314902a6 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 5d630512a886e474ef5293e74f70cfb7f188f2d9..b344d6e69945d012ca4538d3641f67128abeacd9 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: