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 e04eddbbb5321071bdb7fd164f874feeba8d4ecf..a8c04926cafcc9b0578c63ab51ddd7fcc9be67b8 100644 --- a/manifests/setup/prometheus-operator-0alertmanagerCustomResourceDefinition.yaml +++ b/manifests/setup/prometheus-operator-0alertmanagerCustomResourceDefinition.yaml @@ -12,6 +12,7 @@ spec: listKind: AlertmanagerList plural: alertmanagers singular: alertmanager + preserveUnknownFields: false scope: Namespaced versions: - additionalPrinterColumns: diff --git a/manifests/setup/prometheus-operator-0podmonitorCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0podmonitorCustomResourceDefinition.yaml index 01bcac01b0482910d97b771f18c13aabc2971c12..8b8daa7de288fbe0fc356265734de7d6dc59706f 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 versions: - name: v1 diff --git a/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml index d391b6b4e2f763d6edb1b7b1d9f198f71b38ec10..37d4d56030ca6bd171591257561a22de74d53dc1 100644 --- a/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml +++ b/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml @@ -12,6 +12,7 @@ spec: listKind: PrometheusList plural: prometheuses singular: prometheus + preserveUnknownFields: false scope: Namespaced versions: - additionalPrinterColumns: diff --git a/manifests/setup/prometheus-operator-0prometheusruleCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0prometheusruleCustomResourceDefinition.yaml index 6c8404f6d12032ad30caff8a9d12ba01dcb69c2d..5c690605cc84bc1a4e008d33b0f3308204523291 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 versions: - name: v1 diff --git a/manifests/setup/prometheus-operator-0servicemonitorCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0servicemonitorCustomResourceDefinition.yaml index e9909dbfee715c8b46c42e295e4c96200867321e..69bc9654e56c105227a45a5f6b5af107231cf6ef 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 versions: - name: v1 diff --git a/manifests/setup/prometheus-operator-0thanosrulerCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0thanosrulerCustomResourceDefinition.yaml index 3396c98885617a43fd3477dd1f1c67c4d537a32b..a7cff171fe9da35ec99c8110375c15b11fda46c0 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 versions: - name: v1