fix traefik deployment

2024-07-30 17:56:49 +02:00
parent ae45a87b8a
commit 239e2fdf49
3 changed files with 6 additions and 220 deletions
--- a/infrastructure/traefik-system/kustomization.yaml
+++ b/infrastructure/traefik-system/kustomization.yaml
@@ -13,6 +13,6 @@ namespace: traefik-system
 helmCharts:
  - name: traefik
    releaseName: traefik
-    version: 30.0.0
+    version: 30.0.2
    valuesFile: values.yaml
    repo: https://traefik.github.io/charts
--- a/infrastructure/traefik-system/telegraf.values.yaml
+++ b/infrastructure/traefik-system/telegraf.values.yaml
@@ -1,151 +0,0 @@
-## Default values.yaml for Telegraf
-## This is a YAML-formatted file.
-## ref: https://hub.docker.com/r/library/telegraf/tags/
-
-replicaCount: 1
-image:
-  repo: "telegraf"
-  tag: "1.24"
-  pullPolicy: IfNotPresent
-podAnnotations: {}
-podLabels: {}
-imagePullSecrets: []
-## Configure args passed to Telegraf containers
-args: []
-# The name of a secret in the same kubernetes namespace which contains values to
-# be added to the environment (must be manually created)
-# This can be useful for auth tokens, etc.
-
-# envFromSecret: "telegraf-tokens"
-env:
-  - name: HOSTNAME
-    value: "telegraf-polling-service"
-# An older "volumeMounts" key was previously added which will likely
-# NOT WORK as you expect. Please use this newer configuration.
-
-volumes:
- name: traefik-logs
-  persistentVolumeClaim:
-    claimName: traefik-logs
-mountPoints:
- name: traefik-logs
-  mountPath: /traefik_logs
-
-
-## Node labels for pod assignment
-## ref: https://kubernetes.io/docs/user-guide/node-selection/
-nodeSelector: {}
-## Affinity for pod assignment
-## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
-##
-affinity: # to read the traefik logs the pod must be on the same node as traefik
-  podAffinity:
-    requiredDuringSchedulingIgnoredDuringExecution:
-    - labelSelector:
-        matchExpressions: # matches labels: app.kubernetes.io/name=traefik
-        - key: app.kubernetes.io/name
-          operator: In
-          values:
-          - traefik
-      topologyKey: "kubernetes.io/hostname"
-
-## Tolerations for pod assignment
-## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
-##
-tolerations: []
-# - key: "key"
-#   operator: "Equal|Exists"
-#   value: "value"
-#   effect: "NoSchedule|PreferNoSchedule|NoExecute(1.6 only)"
-
-service:
-  enabled: false
-  type: ClusterIP
-  annotations: {}
-rbac:
-  # Specifies whether RBAC resources should be created
-  create: true
-  # Create only for the release namespace or cluster wide (Role vs ClusterRole)
-  clusterWide: false
-  # Rules for the created rule
-  rules: []
-# When using the prometheus input to scrape all pods you need extra rules set to the ClusterRole to be
-# able to scan the pods for scraping labels. The following rules have been taken from:
-# https://github.com/helm/charts/blob/master/stable/prometheus/templates/server-clusterrole.yaml#L8-L46
-#    - apiGroups:
-#        - ""
-#      resources:
-#        - nodes
-#        - nodes/proxy
-#        - nodes/metrics
-#        - services
-#        - endpoints
-#        - pods
-#        - ingresses
-#        - configmaps
-#      verbs:
-#        - get
-#        - list
-#        - watch
-#    - apiGroups:
-#        - "extensions"
-#      resources:
-#        - ingresses/status
-#        - ingresses
-#      verbs:
-#        - get
-#        - list
-#        - watch
-#    - nonResourceURLs:
-#        - "/metrics"
-#      verbs:
-#        - get
-
-serviceAccount:
-  # Specifies whether a ServiceAccount should be created
-  create: true
-  # The name of the ServiceAccount to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name:
-  # Annotations for the ServiceAccount
-  annotations: {}
-## Exposed telegraf configuration
-## For full list of possible values see `/docs/all-config-values.yaml` and `/docs/all-config-values.toml`
-## ref: https://docs.influxdata.com/telegraf/v1.1/administration/configuration/
-config:
-  agent:
-    interval: "10s"
-    round_interval: true
-    metric_batch_size: 1000
-    metric_buffer_limit: 10000
-    collection_jitter: "0s"
-    flush_interval: "10s"
-    flush_jitter: "0s"
-    precision: ""
-    debug: false
-    quiet: false
-    logfile: ""
-    hostname: "$HOSTNAME"
-    omit_hostname: true
-  # processors:
-  #   - enum:
-  #       mapping:
-  #         field: "status"
-  #         dest: "status_code"-+
-  #         value_mappings:
-  #           healthy: 1
-  #           problem: 2
-  #           critical: 3
-  outputs:
-    - influxdb_v2:
-        urls:
-          - "http://influxdb-influxdb2.monitoring:80"
-        token: N_jNm1hZTfyhJneTJj2G357mQ7EJdNzdvebjSJX6JkbyaXNup_IAqeYowblMgV8EjLypNvauTl27ewJvI_rbqQ==
-        organization: "influxdata"
-        bucket: "kluster"
-        # retention_policy: "2w"
-  inputs:
-    - docker_log:
-        endpoint: "unix:///var/run/docker.sock"
-        from_beginning: false
-        container_name_include: ["traefik"]
--- a/infrastructure/traefik-system/values.yaml
+++ b/infrastructure/traefik-system/values.yaml
@@ -7,22 +7,7 @@ deployment:
  kind: Deployment
  # Number of pods of the deployment (only applies when kind == Deployment)
  replicas: 1
-  # Number of old history to retain to allow rollback (If not set, default Kubernetes value is set to 10)
-  # revisionHistoryLimit: 1
-  # Amount of time (in seconds) before Kubernetes will send the SIGKILL signal if Traefik does not shut down
-  terminationGracePeriodSeconds: 60
-  # The minimum number of seconds Traefik needs to be up and running before the DaemonSet/Deployment controller considers it available
-  minReadySeconds: 0
-  # Additional deployment annotations (e.g. for jaeger-operator sidecar injection)
-  annotations: {}
-  # Additional deployment labels (e.g. for filtering deployment by custom labels)
-  labels: {}
-  # Additional pod annotations (e.g. for mesh injection or prometheus scraping)
-  podAnnotations: {}
-  # Additional Pod labels (e.g. for filtering Pod by custom labels)
-  podLabels: {}
-  # Additional containers (e.g. for metric offloading sidecars)
-  additionalContainers: []
+
  # Additional volumes available for use with initContainers and additionalContainers
  additionalVolumes:
    - name: certs
@@ -31,9 +16,7 @@ deployment:
    - name: traefik-config
      configMap:
        name: traefik-config
-  initContainers: []
-  # Use process namespace sharing
-  shareProcessNamespace: false
+

 # Use ingressClass. Ignored if Traefik version < 2.3 / kubernetes < 1.18.x
 ingressClass:
@@ -73,8 +56,6 @@ ingressRoute:
    enabled: false


-
-
 #
 # Configure providers
 #
@@ -83,54 +64,16 @@ providers:
    enabled: true
    allowCrossNamespace: false
    allowExternalNameServices: true
-    allowEmptyServices: false
-    # ingressClass: traefik-internal
-    # labelSelector: environment=production,method=traefik
-    namespaces: []
-      # - "default"
-
  kubernetesIngress:
    enabled: true
    allowExternalNameServices: true
-    allowEmptyServices: false
    ingressClass: traefik
    # labelSelector: environment=production,method=traefik
-    namespaces: []
-      # - "default"
-    # IP used for Kubernetes Ingress endpoints
-    publishedService:
-      enabled: false
-      # Published Kubernetes Service to copy status from. Format: namespace/servicename
-      # By default this Traefik service
-      # pathOverride: ""
-
-
-# Add volumes to the traefik pod. The volume name will be passed to tpl.
-# This can be used to mount a cert pair or a configmap that holds a config.toml file.
-# After the volume has been mounted, add the configs into traefik by using the `additionalArguments` list below, eg:
-# additionalArguments:
-# - "--providers.file.filename=/config/dynamic.toml"
-# - "--ping"
-# - "--ping.entrypoint=web"
-volumes: []
-  # - name: traefik-config
-  #   mountPath: /config
-  #   configMap:
-  #     name: traefik-config

  

 # Additional volumeMounts to add to the Traefik container
 additionalVolumeMounts:
-#   - name: traefik-logs
-#     mountPath: /var/log/traefik
-#     nfs:
-#       server: 192.168.1.157
-#       path: /kluster/traefik
-#   # For instance when using a logshipper for access logs
-  # - name: traefik-logs
-  #   # claimName: traefik-logs
-  #   mountPath: /var/log/traefik
  - name: certs
    # claimName: traefik-certificate
    mountPath: /certs
@@ -138,10 +81,9 @@ additionalVolumeMounts:
    mountPath: /config


-globalArguments:
+additionalArguments:
  - "--configfile=/config/traefik.toml"

-additionalArguments: []

 # Environment variables to be passed to Traefik's binary
 env:
@@ -155,17 +97,12 @@ ports:
  # add a new one, the other ones are kept the same.
  dnsovertls:
    port: 8853
-    expose: true
+    expose:
+      default: true
    exposedPort: 853
    protocol: TCP


-envFrom: []
-# - configMapRef:
-#     name: config-map-name
-# - secretRef:
-#     name: secret-name
-

 tlsOptions: {}