Merge pull request #408 from pgier/optionally-disable-crd-pruning

Remove preserveUnknownField CRD setting
This commit is contained in:
Paul Gier
2020-02-11 08:41:42 -06:00
committed by GitHub
6 changed files with 28 additions and 5 deletions

View File

@@ -17,6 +17,34 @@ 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,
}),
},
},
grafana+:: {
dashboardDefinitions: configMapList.new(super.dashboardDefinitions),
serviceMonitor: {

View File

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

View File

@@ -12,7 +12,6 @@ spec:
listKind: PodMonitorList
plural: podmonitors
singular: podmonitor
preserveUnknownFields: false
scope: Namespaced
validation:
openAPIV3Schema:

View File

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

View File

@@ -12,7 +12,6 @@ spec:
listKind: PrometheusRuleList
plural: prometheusrules
singular: prometheusrule
preserveUnknownFields: false
scope: Namespaced
validation:
openAPIV3Schema:

View File

@@ -12,7 +12,6 @@ spec:
listKind: ServiceMonitorList
plural: servicemonitors
singular: servicemonitor
preserveUnknownFields: false
scope: Namespaced
validation:
openAPIV3Schema: