diff --git a/apps/monitor/crowdsec/helmchart.yaml b/apps/monitor/crowdsec/helmchart.yaml index 5872542..5f68509 100644 --- a/apps/monitor/crowdsec/helmchart.yaml +++ b/apps/monitor/crowdsec/helmchart.yaml @@ -20,7 +20,7 @@ spec: port: 5432 db_name: crowdsec user: app - password: iUYXiu1ZfQdnKTAS3tj8c6dD7OHKlFPrwmzEXNpvcS6nLswV6JPg6YoK1gqZk1sO + password: nyrHzh9WWlDZzvVw7bDFo74gKb9zsls0Sy7OwRTDWiRTNPQQQkW85taUFAoX2AIC sslmode: require agent: affinity: diff --git a/apps/monitor/prometheus/helmchart.yaml b/apps/monitor/prometheus/helmchart.yaml index 79b016e..df9bcfd 100644 --- a/apps/monitor/prometheus/helmchart.yaml +++ b/apps/monitor/prometheus/helmchart.yaml @@ -47,7 +47,7 @@ spec: host: cnpg-cluster-hk-rw.infra-data:5432 name: grafana user: app - password: iUYXiu1ZfQdnKTAS3tj8c6dD7OHKlFPrwmzEXNpvcS6nLswV6JPg6YoK1gqZk1sO + password: nyrHzh9WWlDZzvVw7bDFo74gKb9zsls0Sy7OwRTDWiRTNPQQQkW85taUFAoX2AIC persistence: type: pvc diff --git a/apps/net/nginx/helmchart.yaml b/apps/net/nginx/helmchart.yaml index 71293c3..77ad760 100644 --- a/apps/net/nginx/helmchart.yaml +++ b/apps/net/nginx/helmchart.yaml @@ -64,7 +64,7 @@ spec: - name: API_URL value: "http://crowdsec-service.infra-monitor.svc.cluster.local:8080" - name: API_KEY - value: "NQLDIAxiToOs3PmChTq5Vl+ByY3GAffyhEFqIXDpvU4" + value: "rgILO2mh/t+30LMvzyyMXbfHRmDfBkDDkhEflzHaoQ0" - name: BOUNCER_CONFIG value: "/crowdsec/crowdsec-bouncer.conf" command: ['sh', '-c', "bash /docker_start.sh; mkdir -p /lua_plugins/crowdsec/; cp -R /crowdsec/* /lua_plugins/crowdsec/"] diff --git a/apps/net/tailscale/helmchart.yaml b/apps/net/tailscale/helmchart.yaml new file mode 100644 index 0000000..8890295 --- /dev/null +++ b/apps/net/tailscale/helmchart.yaml @@ -0,0 +1,15 @@ +apiVersion: helm.cattle.io/v1 +kind: HelmChart +metadata: + name: tailscale-derp + namespace: infra-net +spec: + repo: https://devcm-repo.github.io/helm-charts + chart: tailscale-derp + version: 0.0.3 + targetNamespace: infra-net + valuesContent: |- + nodeSelector: + kubernetes.io/hostname: tthk + drep: + hostname: 'derp-hk.dev.cm' \ No newline at end of file diff --git a/install/README.md b/install/README.md index e49a5ce..9b7deca 100644 --- a/install/README.md +++ b/install/README.md @@ -10,11 +10,6 @@ vim /etc/hosts curl -fsSL https://tailscale.com/install.sh | sh ``` -### 开启tailscale的自动更新 -```shell -tailscale set --auto-update -``` - ### 开启ip转发 ```shell echo 'net.ipv4.ip_forward = 1' | tee -a /etc/sysctl.d/99-tailscale.conf