Unverified Commit ae3dffa2 authored by rcarpa's avatar rcarpa Committed by GitHub
Browse files

Merge pull request #137 from rcarpa/servers_external_traffic_policy 

servers: support externalTrafficPolicy in service
parents 2aecc04d dedf1d76

charts/rucio-server/Chart.yaml

+1 −1
Original line number Diff line number Diff line 
name: rucio-server

version: 1.30.2

version: 1.30.3

apiVersion: v1

description: A Helm chart to deploy servers for Rucio

keywords:

charts/rucio-server/templates/deployment.yaml

+18 −0
Original line number Diff line number Diff line
@@ -45,6 +45,24 @@ spec: 
      annotations:

        checksum/config: {{ $common_config | sha1sum }}

    spec:

    {{- if eq (coalesce .Values.service.externalTrafficPolicy "Cluster" | lower) "local" }}

      affinity:

        podAntiAffinity:

          preferredDuringSchedulingIgnoredDuringExecution:

            - weight: 100

              podAffinityTerm:

                topologyKey: "kubernetes.io/hostname"

                labelSelector:

                  matchExpressions:

                    - key: app

                      operator: In

                      values:

                        - {{ template "rucio.name" . }}

                    - key: release

                      operator: In

                      values:

                        - {{ .Release.Name }}

    {{- end }}

    {{- if .Values.serviceAccountName }}

      serviceAccountName: {{ .Values.serviceAccountName }}

    {{- end }}

charts/rucio-server/templates/service.yaml

+3 −0
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ spec: 
{{- if .Values.service.loadBalancerClass }}

  loadBalancerClass: {{ .Values.service.loadBalancerClass }}

{{- end }}

{{- if .Values.service.externalTrafficPolicy }}

  externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}

{{- end }}

{{- if not .Values.service.allocateLoadBalancerNodePorts }}

  allocateLoadBalancerNodePorts: {{ .Values.service.allocateLoadBalancerNodePorts }}

{{- end }}

charts/rucio-server/values.yaml

+22 −28
Original line number Diff line number Diff line
@@ -10,9 +10,9 @@ traceReplicaCount: 0 


# When set, run extra busybox containers in the relevant pods to also expose the error logs

exposeErrorLogs:

  server: True

  authServer: True

  traceServer: True

  server: true

  authServer: true

  traceServer: true



errorLogsExporterResources:

  limits:
@@ -45,6 +45,7 @@ service: 
    # loadbalancer.openstack.org/cascade-delete: "false"

  loadBalancerIP: null

  loadBalancerClass: null

  externalTrafficPolicy: null

  allocateLoadBalancerNodePorts: true



authService:
@@ -184,10 +185,11 @@ wsgi: 
  daemonProcesses: "4"

  daemonThreads: "4"



## values used to configure apache

httpd_config:

  mpm_mode: "event"

  enable_status: "True"

  legacy_dn: "False"

  # mpm_mode: "event"

  # enable_status: "True"

  # legacy_dn: "False"

  # keep_alive: "On"

  # keep_alive_timeout: "5"

  # max_keep_alive_requests: "128"
@@ -199,6 +201,8 @@ httpd_config: 
  # max_spare_threads: "512"

  # max_request_workers: "1280"

  # max_connections_per_child: "2048"

  # max_clients: "20"

  # mpm_mode: "worker"



ingress:

  enabled: false
@@ -287,16 +291,6 @@ traceIngress: 
  #     -----BEGIN CERTIFICATE-----

  #     -----END CERTIFICATE-----



## values used to configure apache

httpd_config:

  # mpm_mode: "worker"

  # start_servers: "1"

  # min_spare_threads: "1"

  # max_spare_threads: "20"

  # threads_per_child: "5"

  # max_clients: "20"

  # max_requests_per_child: "8192"



## values used to configure Rucio

config:

  # common: