-
Notifications
You must be signed in to change notification settings - Fork 220
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.
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
Optimize the helm chart #208
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -112,19 +112,19 @@ Fluent Bit Operator supports `docker` as well as `containerd` and `CRI-O`. `cont | |
If your container runtime is `docker` | ||
|
||
```shell | ||
helm install fluentbit-operator --create-namespace -n kubesphere-logging-system charts/fluent-operator/ --set containerRuntime=docker | ||
helm install fluent-operator --create-namespace -n kubesphere-logging-system charts/fluent-operator/ --set containerRuntime=docker | ||
``` | ||
|
||
If your container runtime is `containerd` | ||
|
||
```shell | ||
helm install fluentbit-operator --create-namespace -n kubesphere-logging-system charts/fluent-operator/ --set containerRuntime=containerd | ||
helm install fluent-operator --create-namespace -n kubesphere-logging-system charts/fluent-operator/ --set containerRuntime=containerd | ||
``` | ||
|
||
If your container runtime is `cri-o` | ||
|
||
```shell | ||
helm install fluentbit-operator --create-namespace -n kubesphere-logging-system charts/fluent-operator/ --set containerRuntime=crio | ||
helm install fluent-operator --create-namespace -n kubesphere-logging-system charts/fluent-operator/ --set containerRuntime=crio | ||
``` | ||
|
||
### Quick Start | ||
|
@@ -187,19 +187,39 @@ kubectl apply -f manifests/logging-stack | |
If your container runtime is `docker` | ||
|
||
```shell | ||
helm upgrade fluentbit-operator --create-namespace -n kubesphere-logging-system charts/fluent-operator/ --set Kubernetes=true,containerRuntime=docker | ||
helm upgrade fluent-operator --create-namespace -n kubesphere-logging-system charts/fluent-operator/ --set Kubernetes=true,containerRuntime=docker | ||
``` | ||
|
||
If your container runtime is `containerd` | ||
|
||
```shell | ||
helm upgrade fluentbit-operator --create-namespace -n kubesphere-logging-system charts/fluent-operator/ --set Kubernetes=true,containerRuntime=containerd | ||
helm upgrade fluent-operator --create-namespace -n kubesphere-logging-system charts/fluent-operator/ --set Kubernetes=true,containerRuntime=containerd | ||
``` | ||
|
||
If your container runtime is `cri-o` | ||
|
||
```shell | ||
helm upgrade fluentbit-operator --create-namespace -n kubesphere-logging-system charts/fluent-operator/ --set Kubernetes=true,containerRuntime=crio | ||
helm upgrade fluent-operator --create-namespace -n kubesphere-logging-system charts/fluent-operator/ --set Kubernetes=true,containerRuntime=crio | ||
``` | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. fluentbit-operator => fluent-operator |
||
|
||
If you want to install the fluentd plugin, you can execute the following command: | ||
|
||
If your container runtime is `docker` | ||
|
||
```shell | ||
helm upgrade fluent-operator --create-namespace -n kubesphere-logging-system charts/fluent-operator/ --set Kubernetes=true,containerRuntime=docker,fluentd.enable=true | ||
``` | ||
|
||
If your container runtime is `containerd` | ||
|
||
```shell | ||
helm upgrade fluent-operator --create-namespace -n kubesphere-logging-system charts/fluent-operator/ --set Kubernetes=true,containerRuntime=containerd,fluentd.enable=true | ||
``` | ||
|
||
If your container runtime is `cri-o` | ||
|
||
```shell | ||
helm upgrade fluent-operator --create-namespace -n kubesphere-logging-system charts/fluent-operator/ --set Kubernetes=true,containerRuntime=crio,fluentd.enable=true | ||
``` | ||
|
||
Within a couple of minutes, you should observe an index available: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,4 +15,4 @@ spec: | |
name: fluent-bit-containerd-config | ||
call: containerd | ||
timeAsTable: true | ||
{{- end }} | ||
{{- end }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -31,4 +31,4 @@ spec: | |
- kubernetes_* | ||
nestUnder: kubernetes | ||
removePrefix: kubernetes_ | ||
{{- end }} | ||
{{- end }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,4 +15,4 @@ spec: | |
name: fluent-bit-lua | ||
call: add_time | ||
timeAsTable: true | ||
{{- end }} | ||
{{- end }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,4 +14,4 @@ spec: | |
dbSync: Normal | ||
systemdFilter: | ||
- _SYSTEMD_UNIT=kubelet.service | ||
{{- end }} | ||
{{- end }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -21,5 +21,5 @@ data: | |
return 0,timestamp,record | ||
end | ||
end | ||
{{- end }} | ||
{{- end }} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -25,4 +25,4 @@ data: | |
|
||
return 1, timestamp, new_record | ||
end | ||
{{- end }} | ||
{{- end }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,22 @@ | ||
{{- if .Values.Kubernetes -}} | ||
{{- if .Values.fluentd.enable -}} | ||
apiVersion: fluentd.fluent.io/v1alpha1 | ||
kind: Fluentd | ||
metadata: | ||
name: {{ .Values.flentd.name }} | ||
name: {{ .Values.fluentd.name }} | ||
labels: | ||
app.kubernetes.io/name: fluentd | ||
spec: | ||
globalInputs: | ||
- forward: | ||
bind: 0.0.0.0 | ||
port: {{ .Values.flentd.port }} | ||
replicas: {{ .Values.flentd.replicas }} | ||
image: {{ .Values.flentd.image }}:{{ .Values.flentd.tag }} | ||
port: {{ .Values.fluentd.port }} | ||
replicas: {{ .Values.fluentd.replicas }} | ||
image: {{ .Values.fluentd.image.repository }}:{{ .Values.fluentd.image.tag }} | ||
resources: | ||
{{- toYaml .Values.fluentbit.resources | nindent 4 }} | ||
fluentdCfgSelector: | ||
matchLabels: | ||
config.fluentd.fluent.io/enabled: "true" | ||
{{- end }} | ||
{{- end }} | ||
{{- end }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The namespace should use an env variable to set before any helm install cmd, and reference this env in the following helm install cmd
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
helm does not initially support the environment variable approach for security reasons. Please see:helm/helm#944 . helm3 can use
set
to set environment variables. But I don't think there is much difference between this way and the previous one. Perhaps we could create anamespace.yaml
file and change its namespace by setting the value invalue.yaml
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe we can use
{{ .Release.Namespace }}
to tell the CRs what's namespace the helm used?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, maybe we needn't change the namespace as a helm parameter.
My concern is this is a community project now, the kubesphere namespace is not appropriate anymore.
We might need to use a namespace like
fluent
for readme, helm, YAML and samples@wenchajun you can do this in another PR and @zhu733756 can help to review
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK,I will revise and test as soon as possible