diff --git a/assets/prometheus-operator-user-workload/deployment.yaml b/assets/prometheus-operator-user-workload/deployment.yaml index d291e78b50..aa2f2f3b81 100644 --- a/assets/prometheus-operator-user-workload/deployment.yaml +++ b/assets/prometheus-operator-user-workload/deployment.yaml @@ -40,7 +40,6 @@ spec: - --config-reloader-cpu-request=1m - --config-reloader-memory-request=10Mi - --web.listen-address=127.0.0.1:8080 - - --labels=app.kubernetes.io/part-of=openshift-monitoring image: quay.io/prometheus-operator/prometheus-operator:v0.67.1 name: prometheus-operator ports: [] diff --git a/assets/prometheus-operator/deployment.yaml b/assets/prometheus-operator/deployment.yaml index 5d20ddda33..7931450492 100644 --- a/assets/prometheus-operator/deployment.yaml +++ b/assets/prometheus-operator/deployment.yaml @@ -41,7 +41,6 @@ spec: - --config-reloader-cpu-request=1m - --config-reloader-memory-request=10Mi - --web.listen-address=127.0.0.1:8080 - - --labels=app.kubernetes.io/part-of=openshift-monitoring image: quay.io/prometheus-operator/prometheus-operator:v0.67.1 name: prometheus-operator ports: [] diff --git a/jsonnet/components/prometheus-operator-user-workload.libsonnet b/jsonnet/components/prometheus-operator-user-workload.libsonnet index 0264a31a93..60d785079b 100644 --- a/jsonnet/components/prometheus-operator-user-workload.libsonnet +++ b/jsonnet/components/prometheus-operator-user-workload.libsonnet @@ -3,7 +3,6 @@ local tlsVolumeName = 'prometheus-operator-user-workload-tls'; local operator = import 'github.com/prometheus-operator/kube-prometheus/jsonnet/kube-prometheus/components/prometheus-operator.libsonnet'; local generateSecret = import '../utils/generate-secret.libsonnet'; local rbac = import '../utils/rbac.libsonnet'; -local labelsAsString = (import '../utils/add-labels.libsonnet').labelsAsString; function(params) local po = operator(params); @@ -97,7 +96,6 @@ function(params) '--config-reloader-cpu-request=1m', '--config-reloader-memory-request=10Mi', '--web.listen-address=127.0.0.1:8080', - '--labels=' + labelsAsString(params.commonLabels), ], ports: [], resources: { diff --git a/jsonnet/components/prometheus-operator.libsonnet b/jsonnet/components/prometheus-operator.libsonnet index 1bb3b14006..ac95e3c685 100644 --- a/jsonnet/components/prometheus-operator.libsonnet +++ b/jsonnet/components/prometheus-operator.libsonnet @@ -5,7 +5,6 @@ local operator = import 'github.com/prometheus-operator/kube-prometheus/jsonnet/ local conversionWebhook = import 'github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/conversion.libsonnet'; local generateSecret = import '../utils/generate-secret.libsonnet'; local rbac = import '../utils/rbac.libsonnet'; -local labelsAsString = (import '../utils/add-labels.libsonnet').labelsAsString; function(params) local po = operator(params); @@ -75,7 +74,6 @@ function(params) '--config-reloader-cpu-request=1m', '--config-reloader-memory-request=10Mi', '--web.listen-address=127.0.0.1:8080', - '--labels=' + labelsAsString(params.commonLabels), ], ports: [], resources: { diff --git a/jsonnet/utils/add-labels.libsonnet b/jsonnet/utils/add-labels.libsonnet index bacad509a3..7bef8dda1d 100644 --- a/jsonnet/utils/add-labels.libsonnet +++ b/jsonnet/utils/add-labels.libsonnet @@ -12,8 +12,4 @@ [k]: o[k] + if o[k].kind != 'ConfigMapList' then { metadata+: { labels+: labels { 'app.kubernetes.io/managed-by': managedBy(o[k]) } } } else {} for k in std.objectFields(o) }, - - labelsAsString(o):: - local parts = [k + '=' + o[k] for k in std.objectFields(o)]; - std.join(',', parts), }