diff --git a/charts/graylog/Chart.lock b/charts/graylog/Chart.lock index c92289347971b69c23ecdcbffe3a0312a82feb3f..c2c9b19ad890c6bfa7e76c895625166d06a80f06 100644 --- a/charts/graylog/Chart.lock +++ b/charts/graylog/Chart.lock @@ -1,9 +1,9 @@ dependencies: - name: mongodb repository: https://groundhog2k.github.io/helm-charts - version: 0.3.5 + version: 0.3.6 - name: elasticsearch repository: https://groundhog2k.github.io/helm-charts - version: 0.1.103 -digest: sha256:e423c5b6c764e813bbc25113e4009cd57e1d927d22de0302264bee187d7c2de8 -generated: "2021-10-17T11:41:49.2311762+02:00" + version: 0.1.104 +digest: sha256:4849ddb07c1d1eba706fc87c41828d790c73d352db5458174f01b6870e249ba4 +generated: "2022-01-06T16:37:39.24843668+01:00" diff --git a/charts/graylog/Chart.yaml b/charts/graylog/Chart.yaml index 66df4695aaeaa1afa06af050dc9dde3d7399930f..b70c152a726407fa393342eeda6c02d0366c99fc 100644 --- a/charts/graylog/Chart.yaml +++ b/charts/graylog/Chart.yaml @@ -7,16 +7,16 @@ type: application maintainers: - name: groundhog2k -version: 0.3.5 +version: 0.3.6 appVersion: "4.2.4-jre11" dependencies: - name: mongodb - version: 0.3.5 + version: 0.3.6 repository: "https://groundhog2k.github.io/helm-charts" condition: mongodb.enabled - name: elasticsearch - version: 0.1.103 + version: 0.1.104 repository: "https://groundhog2k.github.io/helm-charts" condition: elasticsearch.enabled diff --git a/charts/graylog/README.md b/charts/graylog/README.md index 9b567fa8731b79621414912c2b42500d35c226b5..77d66792d050ffed6b60b5cccd4ec1c725cffee5 100644 --- a/charts/graylog/README.md +++ b/charts/graylog/README.md @@ -1,6 +1,6 @@ # Graylog -   +   A Helm chart for Graylog on Kubernetes @@ -41,8 +41,8 @@ $ helm uninstall my-release | Repository | Name | Version | |------------|------|---------| -| @groundhog2k | mongodb | 0.3.5 | -| @groundhog2k | elasticsearch | 0.1.103 | +| @groundhog2k | mongodb | 0.3.6 | +| @groundhog2k | elasticsearch | 0.1.104 | ## Common parameters @@ -95,6 +95,7 @@ $ helm uninstall my-release | service.nodePort | int | `nil` | The http node port (only relevant for type LoadBalancer or NodePort) | | service.clusterIP | string | `nil` | The cluster ip address (only relevant for type LoadBalancer or NodePort) | | service.loadBalancerIP | string | `nil` | The load balancer ip address (only relevant for type LoadBalancer) | +| service.annotations | object | `{}` | Additional service annotations | ## Extra service parameters @@ -110,7 +111,7 @@ Section to define all additional UDP/TCP inputs for Graylog | extraServices[].nodePort | int | `nil` | The http node port (only relevant for type LoadBalancer or NodePort) | | extraServices[].clusterIP | string | `nil` | The cluster ip address (only relevant for type LoadBalancer or NodePort) | | extraServices[].loadBalancerIP | string | `nil` | The load balancer ip address (only relevant for type LoadBalancer) | - +| extraServices[].annotations | object | `{}` | Additional service annotations | ## Ingress parameters diff --git a/charts/graylog/charts/elasticsearch-0.1.103.tgz b/charts/graylog/charts/elasticsearch-0.1.103.tgz deleted file mode 100644 index 163ffbb4d1a1d626b7dda44ef2d7b1963c88164c..0000000000000000000000000000000000000000 Binary files a/charts/graylog/charts/elasticsearch-0.1.103.tgz and /dev/null differ diff --git a/charts/graylog/charts/elasticsearch-0.1.104.tgz b/charts/graylog/charts/elasticsearch-0.1.104.tgz new file mode 100644 index 0000000000000000000000000000000000000000..72db49cb7c138aa04382c77b1cc21cc4b3a6f9f0 Binary files /dev/null and b/charts/graylog/charts/elasticsearch-0.1.104.tgz differ diff --git a/charts/graylog/charts/mongodb-0.3.5.tgz b/charts/graylog/charts/mongodb-0.3.5.tgz deleted file mode 100644 index 680db5489d18f872c1bdee45cbb79b60a5b86e35..0000000000000000000000000000000000000000 Binary files a/charts/graylog/charts/mongodb-0.3.5.tgz and /dev/null differ diff --git a/charts/graylog/charts/mongodb-0.3.6.tgz b/charts/graylog/charts/mongodb-0.3.6.tgz new file mode 100644 index 0000000000000000000000000000000000000000..feb1dca3b008c469b412dabea0e2212d67b364c3 Binary files /dev/null and b/charts/graylog/charts/mongodb-0.3.6.tgz differ diff --git a/charts/graylog/templates/extraservices.yaml b/charts/graylog/templates/extraservices.yaml index cc986300577cad32feb2c1f2b929938287821469..aca4ed10ab4a5b558057c0399619fe0f87286cdc 100644 --- a/charts/graylog/templates/extraservices.yaml +++ b/charts/graylog/templates/extraservices.yaml @@ -8,6 +8,10 @@ metadata: name: {{ $fullname }}-{{ $service.name }} labels: {{- $labels | nindent 4 }} + {{- with $service.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} spec: type: {{ $service.type }} ports: diff --git a/charts/graylog/templates/service.yaml b/charts/graylog/templates/service.yaml index 6598409ddee139ab684fb09dc8838836c92aa130..43e5541f969797a74b6fd2b50852cd079c0e8542 100644 --- a/charts/graylog/templates/service.yaml +++ b/charts/graylog/templates/service.yaml @@ -4,6 +4,10 @@ metadata: name: {{ include "graylog.fullname" . }} labels: {{- include "graylog.labels" . | nindent 4 }} + {{- with .Values.service.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} spec: type: {{ .Values.service.type }} ports: diff --git a/charts/graylog/values.yaml b/charts/graylog/values.yaml index 55a898b1577fe7534138b60a1fe265cfed0748fb..758ae6c4aec9ae7c7fefe3e2665ac1d637a04ec4 100644 --- a/charts/graylog/values.yaml +++ b/charts/graylog/values.yaml @@ -61,6 +61,8 @@ service: clusterIP: ## The loadbalancer ip address (only relevant for type LoadBalancer) loadBalancerIP: + # Annotations to add to the service + annotations: {} ## List of extra service ports extraServices: {} @@ -79,6 +81,8 @@ extraServices: {} # clusterIP: ## The loadbalancer ip address (only relevant for type LoadBalancer) # loadBalancerIP: + ## Annotations to add to the service +# annotations: {} ## Ingress configuration ingress: