Merge pull request #26 from softonic/SRE-000-Add-Annotations

Add Annotations
softonic · Dec 5, 2023 · 378e5cd · 378e5cd
2 parents 6383089 + 90ddb73
commit 378e5cd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git 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
diff --git 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
@@ -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: |