Merge pull request #221 from seungsoo-lee/dev

Updated scripts
accuknox · Jul 23, 2021 · 289dd2a · 289dd2a
2 parents 8c170db + 6d1b114
commit 289dd2a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml
@@ -139,10 +139,12 @@ config:
       topics: 
         - cilium-telemetry-new
         - kubearmor-syslogs
+      security:
+        protocol: SSL
       ssl:
         enabled: false
       events:
-        buffer: 50
+        buffer: 100
 
   logging:
     level: "INFO"

diff --git a/scripts/sync_with_upstream.sh b/scripts/sync_with_upstream.sh
@@ -12,11 +12,11 @@ fi
 # fetch upstream
 git fetch upstream
 
-# switch to master
-git checkout master
+# switch to dev
+git checkout dev
 
 # merge upstream/master
-git merge upstream/master
+git merge upstream/dev
 
 # push to my repo
-git push origin master
+git push origin dev
diff --git a/src/conf/local.yaml b/src/conf/local.yaml
@@ -37,16 +37,18 @@ feed-consumer:
   kafka:
     broker-address-family: v4
     session-timeout-ms: 6000
-    auto-offset-reset: "earliest"
+    auto-offset-reset: "latest"
     bootstrap-servers: "dev-kafka-kafka-bootstrap.accuknox-dev-kafka.svc.cluster.local:9092"
     group-id: policy.cilium
     topics: 
-      - cilium-telemetry
+      - cilium-telemetry-new
       - kubearmor-syslogs
+    security:
+      protocol: SSL
     ssl:
       enabled: false
     events:
-      buffer: 50
+      buffer: 100
 
 logging:
   level: "INFO"