diff --git a/crowdsec/versions/v1/crowdsec-deployment.yaml b/crowdsec/versions/v1/crowdsec-deployment.yaml index 0080ee5..77ae3cb 100644 --- a/crowdsec/versions/v1/crowdsec-deployment.yaml +++ b/crowdsec/versions/v1/crowdsec-deployment.yaml @@ -60,7 +60,7 @@ spec: - name: LEVEL_INFO value: "true" - name: AGENT_USERNAME - value: "kubernetes-cluster" + value: "{{ if .agentUsername }}{{ .agentUsername }}{{ else }}kubernetes-cluster{{ end }}" - name: AGENT_PASSWORD valueFrom: secretKeyRef: @@ -72,6 +72,12 @@ spec: name: crowdsec-secrets key: bouncerApiKey optional: true + {{ if .centralLapiUrl }} + - name: DISABLE_LOCAL_API + value: "true" + - name: LOCAL_API_URL + value: "{{ .centralLapiUrl }}" + {{ end }} ports: - name: lapi containerPort: 8080 @@ -79,6 +85,7 @@ spec: - name: prometheus containerPort: 6060 protocol: TCP + {{ if not .centralLapiUrl }} livenessProbe: httpGet: path: /health @@ -91,6 +98,7 @@ spec: port: 8080 initialDelaySeconds: 10 periodSeconds: 10 + {{ end }} resources: requests: cpu: 50m diff --git a/crowdsec/versions/v1/manifest.yaml b/crowdsec/versions/v1/manifest.yaml index 2e692b5..56bf09a 100644 --- a/crowdsec/versions/v1/manifest.yaml +++ b/crowdsec/versions/v1/manifest.yaml @@ -1,4 +1,4 @@ -version: v1.7.8-1 +version: v1.7.8-4 requires: - name: longhorn - name: traefik @@ -6,6 +6,8 @@ defaultConfig: namespace: crowdsec rateLimitAverage: "100" rateLimitBurst: "100" + centralLapiUrl: "" + agentUsername: "" defaultSecrets: - key: agentPassword - key: bouncerApiKey diff --git a/crowdsec/versions/v1/middleware.yaml b/crowdsec/versions/v1/middleware.yaml index 0af0b47..1d0d850 100644 --- a/crowdsec/versions/v1/middleware.yaml +++ b/crowdsec/versions/v1/middleware.yaml @@ -12,7 +12,7 @@ spec: plugin: bouncer: crowdsecLapiScheme: http - crowdsecLapiHost: crowdsec-lapi.crowdsec.svc.cluster.local:8080 + crowdsecLapiHost: {{ if .centralLapiUrl }}{{ strings.TrimPrefix "http://" .centralLapiUrl }}{{ else }}crowdsec-lapi.crowdsec.svc.cluster.local:8080{{ end }} crowdsecLapiKeyFile: /etc/traefik/crowdsec/api-key crowdsecMode: stream updateIntervalSeconds: 15