Merge remote-tracking branch 'upstream/main' into 2024/add/k8s/portainer

Author: mrnicegyu11

charts/adminer/values.yaml.gotmpl

@@ -102,6 +102,7 @@ volumeMounts: []
 #   mountPath: "/etc/foo"
 #   readOnly: true
 
-nodeSelector: {}
+nodeSelector:
+  ops: "true"
 
 tolerations: []

charts/cert-manager/values.common.yaml.gotmpl

@@ -1,3 +1,6 @@
 crds:
   enabled: true
   keep: true
+
+nodeSelector:
+  ops: "true"

charts/simcore-charts/resource-usage-tracker/values.yaml.gotmpl

@@ -91,7 +91,8 @@ volumeMounts: []
 #   mountPath: "/etc/foo"
 #   readOnly: true
 
-nodeSelector: {}
+nodeSelector:
+  simcore: "true"
 
 tolerations: []
 

charts/traefik/values.common.yaml.gotmpl

@@ -1,6 +1,9 @@
 additionalArguments:
   - "--api.insecure=true"
 
+deployment:
+  kind: DaemonSet
+
 ingressRoute:
   dashboard:
     enabled: false
@@ -19,3 +22,16 @@ ports:
     nodePort: 32080
   websecure:
     nodePort: 32443
+
+nodeSelector:
+  node-role.kubernetes.io/control-plane: "" # in some cases may require tolerations
+
+affinity:  # https://github.com/traefik/traefik-helm-chart/blob/v28.2.0/traefik/values.yaml#L838
+  podAntiAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+      - labelSelector:
+          matchLabels:
+            # https://stackoverflow.com/a/51326166/12124525
+            app.kubernetes.io/name: '{{`{{ template "traefik.name" . }}`}}'
+            app.kubernetes.io/instance: '{{ .Release.Name }}'
+        topologyKey: kubernetes.io/hostname

services/jaeger/docker-compose.yml

@@ -55,6 +55,7 @@ services:
       TRACING_OPENTELEMETRY_COLLECTOR_BATCH_SIZE: ${TRACING_OPENTELEMETRY_COLLECTOR_BATCH_SIZE}
       TRACING_OPENTELEMETRY_COLLECTOR_SAMPLING_PERCENTAGE: ${TRACING_OPENTELEMETRY_COLLECTOR_SAMPLING_PERCENTAGE}
       TRACING_OPENTELEMETRY_COLLECTOR_EXPORTER_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_EXPORTER_ENDPOINT}
+      TRACING_OPENTELEMETRY_COLLECTOR_SERVICE_TELEMETRY_LOG_LEVEL: ${TRACING_OPENTELEMETRY_COLLECTOR_SERVICE_TELEMETRY_LOG_LEVEL}
 networks:
   public:
     external: true

services/jaeger/opentelemetry-collector-config.yaml

@@ -17,7 +17,7 @@ service:
       exporters: [otlphttp,debug]
   telemetry:
     logs:
-      level: "debug"
+      level: ${TRACING_OPENTELEMETRY_COLLECTOR_SERVICE_TELEMETRY_LOG_LEVEL}
 processors:
   batch:
     timeout: 5s

services/jaeger/template.env

@@ -4,3 +4,4 @@ MONITORED_NETWORK=${MONITORED_NETWORK}
 TRACING_OPENTELEMETRY_COLLECTOR_BATCH_SIZE=${TRACING_OPENTELEMETRY_COLLECTOR_BATCH_SIZE}
 TRACING_OPENTELEMETRY_COLLECTOR_SAMPLING_PERCENTAGE=${TRACING_OPENTELEMETRY_COLLECTOR_SAMPLING_PERCENTAGE}
 TRACING_OPENTELEMETRY_COLLECTOR_EXPORTER_ENDPOINT=${TRACING_OPENTELEMETRY_COLLECTOR_EXPORTER_ENDPOINT}
+TRACING_OPENTELEMETRY_COLLECTOR_SERVICE_TELEMETRY_LOG_LEVEL=${TRACING_OPENTELEMETRY_COLLECTOR_SERVICE_TELEMETRY_LOG_LEVEL}

services/simcore/docker-compose.yml

@@ -277,6 +277,7 @@ services:
       - WEBSERVER_LOGLEVEL=${WEBSERVER_LOGLEVEL}
     networks:
       - default
+      - monitored
     deploy:
       # NOTE: https://github.com/ITISFoundation/osparc-simcore/pull/4286
       # NOTE: this MUSTN'T change, or weird things might happen
@@ -309,6 +310,7 @@ services:
     networks:
       - default
       - interactive_services_subnet
+      - monitored
     hostname: "{{.Service.Name}}"
     deploy:
       update_config:
@@ -510,6 +512,8 @@ services:
           cpus: '0.1'
 
   datcore-adapter:
+    networks:
+      - monitored
     deploy:
       replicas: ${SIMCORE_DATCORE_ADAPTER_REPLICAS}
       update_config: