Skip to content

Commit 48acf14

Browse files
committed
Encrypt sensitive information
Signed-off-by: chengdehao <[email protected]>
1 parent 6fb349e commit 48acf14

File tree

3 files changed

+35
-10
lines changed

3 files changed

+35
-10
lines changed

.github/workflows/main.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,31 @@ jobs:
5151
- name: Run verify crds test
5252
run: make verify
5353

54+
helm_tests:
55+
runs-on: ubuntu-18.04
56+
steps:
57+
- name: Checkout
58+
uses: actions/checkout@v2
59+
with:
60+
fetch-depth: 0
61+
62+
- name: Configure Git
63+
run: |
64+
git config user.name "$GITHUB_ACTOR"
65+
git config user.email "[email protected]"
66+
67+
- name: Install Helm
68+
uses: azure/setup-helm@v1
69+
with:
70+
version: v3.6.3
71+
72+
- name: Run chart-releaser
73+
uses: helm/[email protected]
74+
with:
75+
charts_dir: charts
76+
env:
77+
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
78+
5479
e2e_tests:
5580
runs-on: ubuntu-18.04
5681
timeout-minutes: 30

README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -112,19 +112,19 @@ Fluent Bit Operator supports `docker` as well as `containerd` and `CRI-O`. `cont
112112
If your container runtime is `docker`
113113

114114
```shell
115-
helm install fluent-operator --create-namespace -n kubesphere-logging-system charts/fluent-operator/ --set containerRuntime=docker
115+
helm install fluent-operator --create-namespace -n fluent charts/fluent-operator/ --set containerRuntime=docker
116116
```
117117

118118
If your container runtime is `containerd`
119119

120120
```shell
121-
helm install fluent-operator --create-namespace -n kubesphere-logging-system charts/fluent-operator/ --set containerRuntime=containerd
121+
helm install fluent-operator --create-namespace -n fluent charts/fluent-operator/ --set containerRuntime=containerd
122122
```
123123

124124
If your container runtime is `cri-o`
125125

126126
```shell
127-
helm install fluent-operator --create-namespace -n kubesphere-logging-system charts/fluent-operator/ --set containerRuntime=crio
127+
helm install fluent-operator --create-namespace -n fluent charts/fluent-operator/ --set containerRuntime=crio
128128
```
129129

130130
### Quick Start
@@ -187,39 +187,39 @@ kubectl apply -f manifests/logging-stack
187187
If your container runtime is `docker`
188188

189189
```shell
190-
helm upgrade fluent-operator --create-namespace -n kubesphere-logging-system charts/fluent-operator/ --set Kubernetes=true,containerRuntime=docker
190+
helm upgrade fluent-operator --create-namespace -n fluent charts/fluent-operator/ --set Kubernetes=true,containerRuntime=docker
191191
```
192192

193193
If your container runtime is `containerd`
194194

195195
```shell
196-
helm upgrade fluent-operator --create-namespace -n kubesphere-logging-system charts/fluent-operator/ --set Kubernetes=true,containerRuntime=containerd
196+
helm upgrade fluent-operator --create-namespace -n fluent charts/fluent-operator/ --set Kubernetes=true,containerRuntime=containerd
197197
```
198198

199199
If your container runtime is `cri-o`
200200

201201
```shell
202-
helm upgrade fluent-operator --create-namespace -n kubesphere-logging-system charts/fluent-operator/ --set Kubernetes=true,containerRuntime=crio
202+
helm upgrade fluent-operator --create-namespace -n fluent charts/fluent-operator/ --set Kubernetes=true,containerRuntime=crio
203203
```
204204

205205
If you want to install the fluentd plugin, you can execute the following command:
206206

207207
If your container runtime is `docker`
208208

209209
```shell
210-
helm upgrade fluent-operator --create-namespace -n kubesphere-logging-system charts/fluent-operator/ --set Kubernetes=true,containerRuntime=docker,fluentd.enable=true
210+
helm upgrade fluent-operator --create-namespace -n fluent charts/fluent-operator/ --set Kubernetes=true,containerRuntime=docker,fluentd.enable=true
211211
```
212212

213213
If your container runtime is `containerd`
214214

215215
```shell
216-
helm upgrade fluent-operator --create-namespace -n kubesphere-logging-system charts/fluent-operator/ --set Kubernetes=true,containerRuntime=containerd,fluentd.enable=true
216+
helm upgrade fluent-operator --create-namespace -n fluent charts/fluent-operator/ --set Kubernetes=true,containerRuntime=containerd,fluentd.enable=true
217217
```
218218

219219
If your container runtime is `cri-o`
220220

221221
```shell
222-
helm upgrade fluent-operator --create-namespace -n kubesphere-logging-system charts/fluent-operator/ --set Kubernetes=true,containerRuntime=crio,fluentd.enable=true
222+
helm upgrade fluent-operator --create-namespace -n fluent charts/fluent-operator/ --set Kubernetes=true,containerRuntime=crio,fluentd.enable=true
223223
```
224224

225225
Within a couple of minutes, you should observe an index available:

charts/fluent-operator/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ fluentd:
7878
tag: "v1.14.4"
7979
replicas: 1
8080
forward:
81-
host: "kubesphere-logging-system.svc"
81+
host: "fluent.svc"
8282
port: 24224
8383
watchedNamespaces:
8484
- kube-system

0 commit comments

Comments
 (0)