Merge pull request #149 from CathalOConnorRH/MGDAPI-236

MGDAPI-236

Author: pb82

deploy/crds/applicationmonitoring.integreatly.org_applicationmonitorings_crd.yaml

@@ -608,6 +608,10 @@ spec:
               type: object
             alertmanagerInstanceNamespaces:
               type: string
+              description: The key under which additional scrape configs are stored within the secret
+            priorityClassName:
+              type: string
+              description: Priority Class Name
             labelSelector:
               minLength: 1
               type: string

deploy/examples/ApplicationMonitoring.yaml

@@ -11,3 +11,5 @@ spec:
   prometheusInstanceNamespaces: application-monitoring
   alertmanagerInstanceNamespaces: application-monitoring
   selfSignedCerts: true
+  priorityClassName: "rhoam-pod-priority"
+

pkg/apis/applicationmonitoring/v1alpha1/applicationmonitoring_types.go

@@ -17,6 +17,7 @@ type ApplicationMonitoringSpec struct {
 	LabelSelector                    string           `json:"labelSelector"`
 	AdditionalScrapeConfigSecretName string           `json:"additionalScrapeConfigSecretName,omitempty"`
 	AdditionalScrapeConfigSecretKey  string           `json:"additionalScrapeConfigSecretKey,omitempty"`
+	PriorityClassName                string           `json:"priorityClassName,omitempty"`
 	PrometheusRetention              string           `json:"prometheusRetention,omitempty"`
 	PrometheusStorageRequest         string           `json:"prometheusStorageRequest,omitempty"`
 	PrometheusInstanceNamespaces     string           `json:"prometheusInstanceNamespaces,omitempty"`

pkg/controller/applicationmonitoring/templateHelper.go

@@ -95,6 +95,7 @@ type Parameters struct {
 	ImageBlackboxExporter            string
 	ImageTagBlackboxExporter         string
 	BlackboxTargets                  []applicationmonitoring.BlackboxtargetData
+	PriorityClassName                string
 	PrometheusRetention              string
 	PrometheusStorageRequest         string
 	PrometheusInstanceNamespaces     string
@@ -158,6 +159,7 @@ func newTemplateHelper(cr *applicationmonitoring.ApplicationMonitoring, extraPar
 		ImageTagPrometheus:               "4.2",
 		ImageBlackboxExporter:            "quay.io/prometheus/blackbox-exporter",
 		ImageTagBlackboxExporter:         "v0.14.0",
+		PriorityClassName:                cr.Spec.PriorityClassName,
 		PrometheusRetention:              cr.Spec.PrometheusRetention,
 		PrometheusStorageRequest:         cr.Spec.PrometheusStorageRequest,
 		PrometheusInstanceNamespaces:     cr.Spec.PrometheusInstanceNamespaces,

templates/alertmanager.yaml

@@ -49,6 +49,9 @@ spec:
   secrets:
     - alertmanager-k8s-tls
     - alertmanager-k8s-proxy
+{{- if .PriorityClassName }}
+  priorityClassName: {{.PriorityClassName}}
+{{- end }}
 {{- if .Affinity }}
   affinity:
 {{ .Affinity | indent 4 }}

templates/prometheus.yaml

@@ -90,6 +90,9 @@ spec:
   additionalScrapeConfigs:
     name: {{ .ScrapeConfigSecretName }}
     key: integreatly.yaml
+{{- if .PriorityClassName}}
+  priorityClassName: {{.PriorityClassName}}
+{{- end}}
 {{- if .PrometheusStorageRequest}}
   storage:
     volumeClaimTemplate: