Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update default service type from LoadBalancer to NodePort and update nodeAffinity for filebeat/apiserver-audit-installer #87

Merged
merged 8 commits into from
Mar 6, 2024
Merged

Update default service type from LoadBalancer to NodePort and update nodeAffinity for filebeat/apiserver-audit-installer #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f137501
update service from loadbalance to nodeport
Feb 28, 2024
a508c71
rm unused panel (#44)
linuzb Feb 29, 2024
94fa76e
Merge branch 'main' into update_service_type
Mar 4, 2024
52a489b
update service type and annfinity
Mar 5, 2024
beaaa60
update service type and annfinity
Mar 5, 2024
2992340
update service type and annfinity
Mar 6, 2024
af7f1ae
update service type and annfinity
Mar 6, 2024
e0bf5b3
update service type and annfinity
Mar 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions README-zh_CN.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,9 @@ Lunettes 可以识别容器生命周期每个交付阶段的开始和结尾，

第二步：通过 Helm 安装 Lunettes
```bash
# Use NodePort
helm install lunettes oci://registry-1.docker.io/lunettes/lunettes-chart --version [version] \
# enableAuditApiserver 设置为 true 将会开启 apiserver 的审计能力
# 注意: 该过程会重启 apiserver
--set enableAuditApiserver=true \
--set grafanaType=NodePort \
--set jaegerType=NodePort
# install lunettes
# 该过程开启apiserver的审计功能，apiserver会发生重启
helm upgrade --install lunettes oci://registry-1.docker.io/lunettes/lunettes-chart --version [version]
```

查看可用的[版本号](https://hub.docker.com/r/lunettes/lunettes-chart/tags)
Expand Down
6 changes: 4 additions & 2 deletions deploy/helm/lunettes/templates/audit-apiserver/audit-apiserver-ds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@ spec:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: node-role.kubernetes.io/master
operator: Exists
- key: kubernetes.io/hostname
operator: In
values:
- master
tolerations:
- key: node-role.kubernetes.io/control-plane
operator: Exists
Expand Down
9 changes: 7 additions & 2 deletions deploy/helm/lunettes/templates/filebeat/filebeat-ds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,18 @@ spec:
- key: "node-role.kubernetes.io/master"
operator: "Exists"
effect: "NoSchedule"
- key: node-role.kubernetes.io/control-plane
operator: Exists
effect: NoSchedule
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution: # 硬策略
nodeSelectorTerms:
- matchExpressions:
- key: node-role.kubernetes.io/master
operator: Exists
- key: kubernetes.io/hostname
operator: In
values:
- master
volumes:
- configMap:
defaultMode: 420
Expand Down
11 changes: 0 additions & 11 deletions deploy/helm/lunettes/templates/lunettes/lunettes-deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,17 +108,6 @@ spec:
resources:
{{ toYaml .Values.lunettesResources | indent 10 }}
serviceAccountName: lunettes-sa
tolerations:
- key: "node-role.kubernetes.io/master"
operator: "Exists"
effect: "NoSchedule"
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution: # 硬策略
nodeSelectorTerms:
- matchExpressions:
- key: node-role.kubernetes.io/master
operator: Exists
volumes:
- hostPath:
path: {{ .Values.lunettesLogsHostPath }}
Expand Down
10 changes: 5 additions & 5 deletions deploy/helm/lunettes/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ esUser: elastic
esPassword: changeme

# audit-apiserver
enableAuditApiserver: false
enableAuditApiserver: true
auditResources:
limits:
cpu: 100m
Expand All @@ -29,7 +29,7 @@ lunettesImage: lunettes/lunettes:latest
lunettesNodeport: 30880
lunettesLogsPath: /logs
lunettesLogsHostPath: /home/var/logs/lunettes
lunettesType: LoadBalancer
lunettesType: NodePort
apiserverEnabled: true
traceEnable: false
lunettesResources:
Expand All @@ -42,7 +42,7 @@ lunettesResources:

# grafanadi
grafanadiInitKubeClient: false
grafanadiType: LoadBalancer
grafanadiType: NodePort
grafanadiNodePort: 30280
grafanadiLogsPath: /logs
grafanadiLogsHostPath: /home/var/logs/grafanadi
Expand All @@ -56,7 +56,7 @@ grafanadiResources:

# grafana
grafanaImage: lunettes/grafana:latest
grafanaType: LoadBalancer
grafanaType: NodePort
grafanaNodePort: 30180
grafanaResources:
limits:
Expand Down Expand Up @@ -116,7 +116,7 @@ prometheusResources:

# jaejer
jaegerImage: quay.io/jaegertracing/all-in-one:1.45
jaegerType: LoadBalancer
jaegerType: NodePort
jaegerNodePort: 30686
jaegerResources:
limits:
Expand Down
8 changes: 2 additions & 6 deletions docs/quick_start.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,8 @@ kind create cluster \
## Deploy Lunettes with helm

```bash
helm install lunettes oci://registry-1.docker.io/lunettes/lunettes-chart --version [version] \
--set enableAuditApiserver=true \
--set lunettesType=NodePort \
--set grafanadiType=NodePort \
--set grafanaType=NodePort \
--set jaegerType=NodePort
helm upgrade --install lunettes oci://registry-1.docker.io/lunettes/lunettes-chart --version [version]

```
see available [version](https://hub.docker.com/r/lunettes/lunettes-chart/tags)

Expand Down
Loading