feat(crowdsec): crowdsec升级 & dns问题修复

这个提交包含在:
2025-03-27 16:28:32 +08:00 未验证
父节点 28175b9695
当前提交 210e29b469
修改 4 个文件,包含 8 行新增17 行删除
+3 -8
查看文件
@@ -7,21 +7,16 @@ spec:
repo: https://crowdsecurity.github.io/helm-charts repo: https://crowdsecurity.github.io/helm-charts
chart: crowdsec chart: crowdsec
targetNamespace: infra-net targetNamespace: infra-net
version: 0.15.0 version: 0.19.1
valuesContent: |- valuesContent: |-
container_runtime: containerd container_runtime: containerd
image: image:
tag: v1.6.4 tag: v1.6.8
agent: agent:
# 由于dataScope为loki,所以此处强制要求部署在loki所在的节点 以节省网络资源 # 由于dataScope为loki,所以此处强制要求部署在loki所在的节点 以节省网络资源
nodeSelector: nodeSelector:
kubernetes.io/hostname: alihka kubernetes.io/hostname: alihka
# 此处无实际作用 只是为了过helmChart的校验 isDeployment: true
acquisition:
- namespace: infra-net
podName: ingress-nginx-controller-*
program: nginx
poll_without_inotify: true
additionalAcquisition: additionalAcquisition:
- source: loki - source: loki
log_level: info log_level: info
+2 -2
查看文件
@@ -106,7 +106,7 @@ spec:
plugins: "crowdsec" plugins: "crowdsec"
lua-shared-dicts: "crowdsec_cache: 50m" lua-shared-dicts: "crowdsec_cache: 50m"
# 启用geoip2模块 # 启用geoip2模块
maxmindLicenseKey: "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" maxmindLicenseKey: "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"
extraArgs: extraArgs:
default-ssl-certificate: "infra-net/dev-cm-crt" default-ssl-certificate: "infra-net/dev-cm-crt"
# crowdsec插件配置 # crowdsec插件配置
@@ -118,7 +118,7 @@ spec:
- name: API_URL - name: API_URL
value: "http://crowdsec-service.infra-net.svc.cluster.local:8080" value: "http://crowdsec-service.infra-net.svc.cluster.local:8080"
- name: API_KEY - name: API_KEY
value: "rgILO2mh/t+30LMvzyyMXbfHRmDfBkDDkhEflzHaoQ0" value: "CLeXxBJSTL+Az1w64S91APOyuNdc0nKgG4swNLvL0os"
- name: BOUNCER_CONFIG - name: BOUNCER_CONFIG
value: "/crowdsec/crowdsec-bouncer.conf" value: "/crowdsec/crowdsec-bouncer.conf"
- name: MODE - name: MODE
-4
查看文件
@@ -9,10 +9,6 @@ data:
template ANY HINFO . { template ANY HINFO . {
rcode NXDOMAIN rcode NXDOMAIN
} }
# 不解析IPV6
template ANY AAAA {
rcode NXDOMAIN
}
local.server: | local.server: |
# #
+2 -2
查看文件
@@ -126,7 +126,7 @@ spec:
requiredDuringSchedulingIgnoredDuringExecution: requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms: nodeSelectorTerms:
- matchExpressions: - matchExpressions:
- key: node-role.kubernetes.io/master - key: node-role.kubernetes.io/control-plane
operator: NotIn operator: NotIn
values: values:
- "true" - "true"
@@ -143,7 +143,7 @@ spec:
operator: "Exists" operator: "Exists"
containers: containers:
- name: node-cache - name: node-cache
image: registry.k8s.io/dns/k8s-dns-node-cache:1.23.1 image: registry.k8s.io/dns/k8s-dns-node-cache:1.25.0
resources: resources:
requests: requests:
cpu: 25m cpu: 25m