From cf28d4e450c9d5261e2196e5bc0a6b8c193edc7f Mon Sep 17 00:00:00 2001 From: Rodrigo Freelancer Date: Tue, 5 Dec 2023 17:23:21 +0100 Subject: [PATCH 1/2] Add Annotations --- charts/ip-blocker/templates/deployment.yaml | 2 ++ charts/ip-blocker/values.yaml | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/charts/ip-blocker/templates/deployment.yaml b/charts/ip-blocker/templates/deployment.yaml index 2918598..a16c1c4 100644 --- a/charts/ip-blocker/templates/deployment.yaml +++ b/charts/ip-blocker/templates/deployment.yaml @@ -4,6 +4,8 @@ metadata: name: {{ include "ip-blocker.fullname" . }} labels: {{- include "ip-blocker.labels" . | nindent 6 }} + annotations: + {{- toYaml .Values.annotations | nindent 8 }} spec: replicas: {{ .Values.replicaCount }} selector: diff --git a/charts/ip-blocker/values.yaml b/charts/ip-blocker/values.yaml index 367c92e..59d18b4 100644 --- a/charts/ip-blocker/values.yaml +++ b/charts/ip-blocker/values.yaml @@ -2,6 +2,7 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. +annotations: {} replicaCount: 1 image: @@ -38,13 +39,15 @@ extraVolumes: [] extraVolumeMounts: [] elastic: - + elasticSearch: config: files: elastic-search-config.yaml: - queries: [] + query: + files: {} + # Example #- name: "list429" # elasticIndex: "test" @@ -55,7 +58,7 @@ elasticSearch: # elasticFieldtoSearch: "geoip" # queryFile: "/etc/config/queryElasticCityOrg.json" - + #query: # files: # queryElastic429.json: | From 90ddb738cadedcb6fdbe63f73e1b834aeefc3190 Mon Sep 17 00:00:00 2001 From: Rodrigo Freelancer Date: Tue, 5 Dec 2023 17:25:56 +0100 Subject: [PATCH 2/2] Bump version --- charts/ip-blocker/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/ip-blocker/Chart.yaml b/charts/ip-blocker/Chart.yaml index a2166a8..fcf3a7b 100644 --- a/charts/ip-blocker/Chart.yaml +++ b/charts/ip-blocker/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: ip-blocker description: This chart deploys a daemon in k8s for blocking IPs from unwanted bots type: application -version: 0.6.1 -appVersion: 0.6.1 +version: 0.6.2 +appVersion: 0.6.2