From c9588eb515d0d4a141bf7a3d5ed78c308a290cfa Mon Sep 17 00:00:00 2001 From: jmlrt <8582351+jmlrt@users.noreply.github.com> Date: Wed, 9 Feb 2022 17:09:35 +0100 Subject: [PATCH 1/2] [logstash] add externalTrafficPolicy support Fix #1548 --- logstash/templates/service.yaml | 3 +++ logstash/tests/logstash_test.py | 23 +++++++++++++++++++---- logstash/values.yaml | 27 +++++++++++++++++---------- 3 files changed, 39 insertions(+), 14 deletions(-) mode change 100755 => 100644 logstash/tests/logstash_test.py mode change 100755 => 100644 logstash/values.yaml diff --git a/logstash/templates/service.yaml b/logstash/templates/service.yaml index d3a61bc7a..7b9161769 100644 --- a/logstash/templates/service.yaml +++ b/logstash/templates/service.yaml @@ -19,6 +19,9 @@ spec: {{- with .Values.service.loadBalancerSourceRanges }} loadBalancerSourceRanges: {{ toYaml . | indent 4 }} +{{- end }} +{{- if .Values.service.externalTrafficPolicy }} + externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }} {{- end }} selector: app: "{{ template "logstash.fullname" . }}" diff --git a/logstash/tests/logstash_test.py b/logstash/tests/logstash_test.py old mode 100755 new mode 100644 index 4d6e7b2fe..94becffb7 --- a/logstash/tests/logstash_test.py +++ b/logstash/tests/logstash_test.py @@ -204,7 +204,10 @@ def test_adding_a_extra_port(): extraPorts = r["statefulset"][name]["spec"]["template"]["spec"]["containers"][0][ "ports" ] - assert {"name": "foo", "containerPort": 30000,} in extraPorts + assert { + "name": "foo", + "containerPort": 30000, + } in extraPorts def test_adding_a_extra_init_container(): @@ -603,9 +606,10 @@ def test_adding_in_logstash_config(): s = r["statefulset"][name]["spec"]["template"]["spec"] - assert {"configMap": {"name": name + "-config"}, "name": "logstashconfig",} in s[ - "volumes" - ] + assert { + "configMap": {"name": name + "-config"}, + "name": "logstashconfig", + } in s["volumes"] assert { "mountPath": "/usr/share/logstash/config/logstash.yml", "name": "logstashconfig", @@ -907,6 +911,17 @@ def test_adding_a_service(): assert "loadBalancerIP" not in s["spec"] +def test_adding_an_externalTrafficPolicy(): + config = """ + service: + externalTrafficPolicy: Local + """ + + r = helm_template(config) + + assert r["service"][name]["spec"]["externalTrafficPolicy"] == "Local" + + def test_setting_fullnameOverride(): config = """ fullnameOverride: 'logstash-custom' diff --git a/logstash/values.yaml b/logstash/values.yaml old mode 100755 new mode 100644 index 4cabddaf7..48cb251f9 --- a/logstash/values.yaml +++ b/logstash/values.yaml @@ -61,7 +61,6 @@ secrets: [] # cert.crt: "LS0tLS1CRUdJTiBlRJRklDQVRFLS0tLS0K" # cert.key.filepath: "secrets.crt" # The path to file should be relative to the `values.yaml` file. - # A list of secrets and their paths to mount inside the pod secretMounts: [] @@ -92,7 +91,7 @@ resources: memory: "1536Mi" volumeClaimTemplate: - accessModes: [ "ReadWriteOnce" ] + accessModes: ["ReadWriteOnce"] resources: requests: storage: 1Gi @@ -101,7 +100,8 @@ rbac: create: false serviceAccountAnnotations: {} serviceAccountName: "" - annotations: {} + annotations: + {} #annotation1: "value1" #annotation2: "value2" #annotation3: "value3" @@ -128,21 +128,25 @@ persistence: enabled: false annotations: {} -extraVolumes: "" +extraVolumes: + "" # - name: extras # emptyDir: {} -extraVolumeMounts: "" +extraVolumeMounts: + "" # - name: extras # mountPath: /usr/share/extras # readOnly: true -extraContainers: "" +extraContainers: + "" # - name: do-something # image: busybox # command: ['do', 'something'] -extraInitContainers: "" +extraInitContainers: + "" # - name: do-something # image: busybox # command: ['do', 'something'] @@ -174,7 +178,8 @@ podManagementPolicy: "Parallel" httpPort: 9600 # Custom ports to add to logstash -extraPorts: [] +extraPorts: + [] # - name: beats # containerPort: 5001 @@ -192,7 +197,7 @@ podSecurityContext: securityContext: capabilities: drop: - - ALL + - ALL # readOnlyRootFilesystem: true runAsNonRoot: true runAsUser: 1000 @@ -246,7 +251,8 @@ tolerations: [] nameOverride: "" fullnameOverride: "" -lifecycle: {} +lifecycle: + {} # preStop: # exec: # command: ["/bin/sh", "-c", "echo Hello from the postStart handler > /usr/share/message"] @@ -258,6 +264,7 @@ service: {} # annotations: {} # type: ClusterIP # loadBalancerIP: "" +# externalTrafficPolicy: "" # ports: # - name: beats # port: 5044 From a25c81d1354cf3308863d8873a6badb5bbf99d46 Mon Sep 17 00:00:00 2001 From: jmlrt <8582351+jmlrt@users.noreply.github.com> Date: Wed, 9 Feb 2022 17:35:51 +0100 Subject: [PATCH 2/2] fixup! [logstash] add externalTrafficPolicy support --- logstash/tests/logstash_test.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/logstash/tests/logstash_test.py b/logstash/tests/logstash_test.py index 94becffb7..cff344739 100644 --- a/logstash/tests/logstash_test.py +++ b/logstash/tests/logstash_test.py @@ -204,10 +204,7 @@ def test_adding_a_extra_port(): extraPorts = r["statefulset"][name]["spec"]["template"]["spec"]["containers"][0][ "ports" ] - assert { - "name": "foo", - "containerPort": 30000, - } in extraPorts + assert {"name": "foo", "containerPort": 30000,} in extraPorts def test_adding_a_extra_init_container(): @@ -606,10 +603,9 @@ def test_adding_in_logstash_config(): s = r["statefulset"][name]["spec"]["template"]["spec"] - assert { - "configMap": {"name": name + "-config"}, - "name": "logstashconfig", - } in s["volumes"] + assert {"configMap": {"name": name + "-config"}, "name": "logstashconfig",} in s[ + "volumes" + ] assert { "mountPath": "/usr/share/logstash/config/logstash.yml", "name": "logstashconfig",