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 e04eddbb..a8c04926 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 01bcac01..8b8daa7d 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 d391b6b4..37d4d560 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 6c8404f6..5c690605 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 e9909dbf..69bc9654 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 3396c988..a7cff171 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