Merge branch 'master' into same_publisher_everywhere

armadaproject · Jul 22, 2024 · 5b152dd · 5b152dd
2 parents 5565f17 + 56c9d9f
commit 5b152dd
Show file tree

Hide file tree

Showing 44 changed files with 514 additions and 162 deletions.
diff --git a/config/scheduler/config.yaml b/config/scheduler/config.yaml
@@ -88,7 +88,6 @@ scheduling:
   disableScheduling: false
   enableAssertions: false
   protectedFractionOfFairShare: 1.0
-  useAdjustedFairShareProtection: true
   nodeIdLabel: "kubernetes.io/hostname"
   priorityClasses:
     armada-default:

diff --git a/deployment/armada/templates/deployment.yaml b/deployment/armada/templates/deployment.yaml
@@ -72,7 +72,7 @@ spec:
             {{- if and .Values.applicationConfig.profiling .Values.applicationConfig.profiling.port }}
             - containerPort: {{ .Values.applicationConfig.profiling.port }}
               protocol: TCP
-              name: pprof
+              name: profiling
             {{- end }}
           volumeMounts:
             - name: user-config

diff --git a/deployment/armada/templates/profiling-ingress.yaml b/deployment/armada/templates/profiling-ingress.yaml
@@ -0,0 +1,35 @@
+{{- if and .Values.applicationConfig.profiling .Values.applicationConfig.profiling.hostnames }}
+{{- $root := . -}}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ include "armada.name" . }}-profiling
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    certmanager.k8s.io/cluster-issuer: {{ required "A value is required for .Values.applicationConfig.profiling.clusterIssuer" .Values.applicationConfig.profiling.clusterIssuer }}
+    cert-manager.io/cluster-issuer: {{ required "A value is required for .Values.applicationConfig.profiling.clusterIssuer" .Values.applicationConfig.profiling.clusterIssuer }}
+  labels:
+    {{- include "armada.labels.all" . | nindent 4 }}
+spec:
+  rules:
+  {{- range required "A value is required for .Values.applicationConfig.profiling.hostnames" .Values.applicationConfig.profiling.hostnames }}
+  - host: {{ .  }}
+    http:
+      paths:
+        - path: /
+          pathType: Prefix
+          backend:
+            service:
+              name: {{ include "armada.name" $root }}-server-profiling
+              port:
+                number: {{ $root.Values.applicationConfig.profiling.port }}
+  {{ end -}}
+  tls:
+    - hosts:
+       {{- range required "A value is required for .Values.applicationConfig.profiling.hostnames" .Values.applicationConfig.profiling.hostnames }}
+      - {{ . -}}
+       {{ end }}
+      secretName: {{ include "armada.name" $root }}-profiling-service-tls
+---
+{{- end }}
+
diff --git a/deployment/armada/templates/profiling-service.yaml b/deployment/armada/templates/profiling-service.yaml
@@ -0,0 +1,19 @@
+{{- if and .Values.applicationConfig.profiling .Values.applicationConfig.profiling.port }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "armada.name" . }}-server-profiling
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "armada.labels.all" . | nindent 4 }}
+    name: {{ include "armada.name" . }}-profiling
+spec:
+  selector:
+    app: {{ include "armada.name" . }}
+  ports:
+    - name: profiling
+      protocol: TCP
+      port: {{ .Values.applicationConfig.profiling.port }}
+---
+{{- end }}
+
diff --git a/deployment/binoculars/templates/deployment.yaml b/deployment/binoculars/templates/deployment.yaml
@@ -57,7 +57,7 @@ spec:
             {{- if and .Values.applicationConfig.profiling .Values.applicationConfig.profiling.port }}
             - containerPort: {{ .Values.applicationConfig.profiling.port }}
               protocol: TCP
-              name: pprof
+              name: profiling
             {{- end }}
           volumeMounts:
             - name: user-config

diff --git a/deployment/binoculars/templates/profiling-ingress.yaml b/deployment/binoculars/templates/profiling-ingress.yaml
@@ -0,0 +1,35 @@
+{{- if and .Values.applicationConfig.profiling .Values.applicationConfig.profiling.hostnames }}
+{{- $root := . -}}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ include "binoculars.name" . }}-profiling
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    certmanager.k8s.io/cluster-issuer: {{ required "A value is required for .Values.applicationConfig.profiling.clusterIssuer" .Values.applicationConfig.profiling.clusterIssuer }}
+    cert-manager.io/cluster-issuer: {{ required "A value is required for .Values.applicationConfig.profiling.clusterIssuer" .Values.applicationConfig.profiling.clusterIssuer }}
+  labels:
+    {{- include "binoculars.labels.all" . | nindent 4 }}
+spec:
+  rules:
+  {{- range required "A value is required for .Values.applicationConfig.profiling.hostnames" .Values.applicationConfig.profiling.hostnames }}
+  - host: {{ .  }}
+    http:
+      paths:
+        - path: /
+          pathType: Prefix
+          backend:
+            service:
+              name: {{ include "binoculars.name" $root }}-profiling
+              port:
+                number: {{ $root.Values.applicationConfig.profiling.port }}
+  {{ end -}}
+  tls:
+    - hosts:
+       {{- range required "A value is required for .Values.applicationConfig.profiling.hostnames" .Values.applicationConfig.profiling.hostnames }}
+      - {{ . -}}
+       {{ end }}
+      secretName: {{ include "binoculars.name" $root }}-profiling-service-tls
+---
+{{- end }}
+
diff --git a/deployment/binoculars/templates/profiling-service.yaml b/deployment/binoculars/templates/profiling-service.yaml
@@ -0,0 +1,19 @@
+{{- if and .Values.applicationConfig.profiling .Values.applicationConfig.profiling.port }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "binoculars.name" . }}-profiling
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "binoculars.labels.all" . | nindent 4 }}
+    name: {{ include "binoculars.name" . }}-profiling
+spec:
+  selector:
+    app: {{ include "binoculars.name" . }}
+  ports:
+    - name: profiling
+      protocol: TCP
+      port: {{ .Values.applicationConfig.profiling.port }}
+---
+{{- end }}
+
diff --git a/deployment/event-ingester/templates/deployment.yaml b/deployment/event-ingester/templates/deployment.yaml
@@ -48,7 +48,7 @@ spec:
             {{- if and .Values.applicationConfig.profiling .Values.applicationConfig.profiling.port }}
             - containerPort: {{ .Values.applicationConfig.profiling.port }}
               protocol: TCP
-              name: pprof
+              name: profiling
             {{- end }}
             - containerPort: {{ .Values.applicationConfig.metricsPort }}
               protocol: TCP

diff --git a/deployment/event-ingester/templates/profiling-ingress.yaml b/deployment/event-ingester/templates/profiling-ingress.yaml
@@ -0,0 +1,35 @@
+{{- if and .Values.applicationConfig.profiling .Values.applicationConfig.profiling.hostnames }}
+{{- $root := . -}}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ include "event_ingester.name" . }}-profiling
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    certmanager.k8s.io/cluster-issuer: {{ required "A value is required for .Values.applicationConfig.profiling.clusterIssuer" .Values.applicationConfig.profiling.clusterIssuer }}
+    cert-manager.io/cluster-issuer: {{ required "A value is required for .Values.applicationConfig.profiling.clusterIssuer" .Values.applicationConfig.profiling.clusterIssuer }}
+  labels:
+    {{- include "event_ingester.labels.all" . | nindent 4 }}
+spec:
+  rules:
+  {{- range required "A value is required for .Values.applicationConfig.profiling.hostnames" .Values.applicationConfig.profiling.hostnames }}
+  - host: {{ .  }}
+    http:
+      paths:
+        - path: /
+          pathType: Prefix
+          backend:
+            service:
+              name: {{ include "event_ingester.name" $root }}-profiling
+              port:
+                number: {{ $root.Values.applicationConfig.profiling.port }}
+  {{ end -}}
+  tls:
+    - hosts:
+       {{- range required "A value is required for .Values.applicationConfig.profiling.hostnames" .Values.applicationConfig.profiling.hostnames }}
+      - {{ . -}}
+       {{ end }}
+      secretName: {{ include "event_ingester.name" $root }}-profiling-service-tls
+---
+{{- end }}
+
diff --git a/deployment/event-ingester/templates/profiling-service.yaml b/deployment/event-ingester/templates/profiling-service.yaml
@@ -0,0 +1,19 @@
+{{- if and .Values.applicationConfig.profiling .Values.applicationConfig.profiling.port }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "event_ingester.name" . }}-profiling
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "event_ingester.labels.all" . | nindent 4 }}
+    name: {{ include "event_ingester.name" . }}-profiling
+spec:
+  selector:
+    app: {{ include "event_ingester.name" . }}
+  ports:
+    - name: profiling
+      protocol: TCP
+      port: {{ .Values.applicationConfig.profiling.port }}
+---
+{{- end }}
+
diff --git a/deployment/executor/templates/deployment.yaml b/deployment/executor/templates/deployment.yaml
@@ -55,7 +55,7 @@ spec:
             {{- if and .Values.applicationConfig.profiling .Values.applicationConfig.profiling.port }}
             - containerPort: {{ .Values.applicationConfig.profiling.port }}
               protocol: TCP
-              name: pprof
+              name: profiling
             {{- end }}
           volumeMounts:
             - name: user-config

diff --git a/deployment/executor/templates/profiling-ingress.yaml b/deployment/executor/templates/profiling-ingress.yaml
@@ -0,0 +1,35 @@
+{{- if and .Values.applicationConfig.profiling .Values.applicationConfig.profiling.hostnames }}
+{{- $root := . -}}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ include "executor.name" . }}-profiling
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    certmanager.k8s.io/cluster-issuer: {{ required "A value is required for .Values.applicationConfig.profiling.clusterIssuer" .Values.applicationConfig.profiling.clusterIssuer }}
+    cert-manager.io/cluster-issuer: {{ required "A value is required for .Values.applicationConfig.profiling.clusterIssuer" .Values.applicationConfig.profiling.clusterIssuer }}
+  labels:
+    {{- include "executor.labels.all" . | nindent 4 }}
+spec:
+  rules:
+  {{- range required "A value is required for .Values.applicationConfig.profiling.hostnames" .Values.applicationConfig.profiling.hostnames }}
+  - host: {{ .  }}
+    http:
+      paths:
+        - path: /
+          pathType: Prefix
+          backend:
+            service:
+              name: {{ include "executor.name" $root }}-profiling
+              port:
+                number: {{ $root.Values.applicationConfig.profiling.port }}
+  {{ end -}}
+  tls:
+    - hosts:
+       {{- range required "A value is required for .Values.applicationConfig.profiling.hostnames" .Values.applicationConfig.profiling.hostnames }}
+      - {{ . -}}
+       {{ end }}
+      secretName: {{ include "executor.name" $root }}-profiling-service-tls
+---
+{{- end }}
+
diff --git a/deployment/executor/templates/profiling-service.yaml b/deployment/executor/templates/profiling-service.yaml
@@ -0,0 +1,19 @@
+{{- if and .Values.applicationConfig.profiling .Values.applicationConfig.profiling.port }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "executor.name" . }}-profiling
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "executor.labels.all" . | nindent 4 }}
+    name: {{ include "executor.name" . }}-profiling
+spec:
+  selector:
+    app: {{ include "executor.name" . }}
+  ports:
+    - name: profiling
+      protocol: TCP
+      port: {{ .Values.applicationConfig.profiling.port }}
+---
+{{- end }}
+
diff --git a/deployment/lookout-ingester-v2/templates/deployment.yaml b/deployment/lookout-ingester-v2/templates/deployment.yaml
@@ -48,7 +48,7 @@ spec:
             {{- if and .Values.applicationConfig.profiling .Values.applicationConfig.profiling.port }}
             - containerPort: {{ .Values.applicationConfig.profiling.port }}
               protocol: TCP
-              name: pprof
+              name: profiling
             {{- end }}
             - containerPort: {{ .Values.applicationConfig.metricsPort }}
               protocol: TCP

diff --git a/deployment/lookout-ingester-v2/templates/profiling-ingress.yaml b/deployment/lookout-ingester-v2/templates/profiling-ingress.yaml
@@ -0,0 +1,35 @@
+{{- if and .Values.applicationConfig.profiling .Values.applicationConfig.profiling.hostnames }}
+{{- $root := . -}}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ include "lookout_ingester_v2.name" . }}-profiling
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    certmanager.k8s.io/cluster-issuer: {{ required "A value is required for .Values.applicationConfig.profiling.clusterIssuer" .Values.applicationConfig.profiling.clusterIssuer }}
+    cert-manager.io/cluster-issuer: {{ required "A value is required for .Values.applicationConfig.profiling.clusterIssuer" .Values.applicationConfig.profiling.clusterIssuer }}
+  labels:
+    {{- include "lookout_ingester_v2.labels.all" . | nindent 4 }}
+spec:
+  rules:
+  {{- range required "A value is required for .Values.applicationConfig.profiling.hostnames" .Values.applicationConfig.profiling.hostnames }}
+  - host: {{ .  }}
+    http:
+      paths:
+        - path: /
+          pathType: Prefix
+          backend:
+            service:
+              name: {{ include "lookout_ingester_v2.name" $root }}-profiling
+              port:
+                number: {{ $root.Values.applicationConfig.profiling.port }}
+  {{ end -}}
+  tls:
+    - hosts:
+       {{- range required "A value is required for .Values.applicationConfig.profiling.hostnames" .Values.applicationConfig.profiling.hostnames }}
+      - {{ . -}}
+       {{ end }}
+      secretName: {{ include "lookout_ingester_v2.name" $root }}-profiling-service-tls
+---
+{{- end }}
+
diff --git a/deployment/lookout-ingester-v2/templates/profiling-service.yaml b/deployment/lookout-ingester-v2/templates/profiling-service.yaml
@@ -0,0 +1,19 @@
+{{- if and .Values.applicationConfig.profiling .Values.applicationConfig.profiling.port }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "lookout_ingester_v2.name" . }}-profiling
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "lookout_ingester_v2.labels.all" . | nindent 4 }}
+    name: {{ include "lookout_ingester_v2.name" . }}-profiling
+spec:
+  selector:
+    app: {{ include "lookout_ingester_v2.name" . }}
+  ports:
+    - name: profiling
+      protocol: TCP
+      port: {{ .Values.applicationConfig.profiling.port }}
+---
+{{- end }}
+
diff --git a/deployment/lookout-v2/templates/deployment.yaml b/deployment/lookout-v2/templates/deployment.yaml
@@ -51,7 +51,7 @@ spec:
             {{- if and .Values.applicationConfig.profiling .Values.applicationConfig.profiling.port }}
             - containerPort: {{ .Values.applicationConfig.profiling.port }}
               protocol: TCP
-              name: pprof
+              name: profiling
             {{- end }}
             - containerPort: {{ .Values.applicationConfig.metricsPort }}
               protocol: TCP

diff --git a/deployment/lookout-v2/templates/profiling-ingress.yaml b/deployment/lookout-v2/templates/profiling-ingress.yaml
@@ -0,0 +1,35 @@
+{{- if and .Values.applicationConfig.profiling .Values.applicationConfig.profiling.hostnames }}
+{{- $root := . -}}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ include "lookout_v2.name" . }}-profiling
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    certmanager.k8s.io/cluster-issuer: {{ required "A value is required for .Values.applicationConfig.profiling.clusterIssuer" .Values.applicationConfig.profiling.clusterIssuer }}
+    cert-manager.io/cluster-issuer: {{ required "A value is required for .Values.applicationConfig.profiling.clusterIssuer" .Values.applicationConfig.profiling.clusterIssuer }}
+  labels:
+    {{- include "lookout_v2.labels.all" . | nindent 4 }}
+spec:
+  rules:
+  {{- range required "A value is required for .Values.applicationConfig.profiling.hostnames" .Values.applicationConfig.profiling.hostnames }}
+  - host: {{ .  }}
+    http:
+      paths:
+        - path: /
+          pathType: Prefix
+          backend:
+            service:
+              name: {{ include "lookout_v2.name" $root }}-profiling
+              port:
+                number: {{ $root.Values.applicationConfig.profiling.port }}
+  {{ end -}}
+  tls:
+    - hosts:
+       {{- range required "A value is required for .Values.applicationConfig.profiling.hostnames" .Values.applicationConfig.profiling.hostnames }}
+      - {{ . -}}
+       {{ end }}
+      secretName: {{ include "lookout_v2.name" $root }}-profiling-service-tls
+---
+{{- end }}
+
diff --git a/deployment/lookout-v2/templates/profiling-service.yaml b/deployment/lookout-v2/templates/profiling-service.yaml
@@ -0,0 +1,19 @@
+{{- if and .Values.applicationConfig.profiling .Values.applicationConfig.profiling.port }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "lookout_v2.name" . }}-profiling
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "lookout_v2.labels.all" . | nindent 4 }}
+    name: {{ include "lookout_v2.name" . }}-profiling
+spec:
+  selector:
+    app: {{ include "lookout_v2.name" . }}
+  ports:
+    - name: profiling
+      protocol: TCP
+      port: {{ .Values.applicationConfig.profiling.port }}
+---
+{{- end }}
+