Merge pull request #85 from wanjunlei/release-0.7

update readme

Author: Benjamin Huo

Makefile

@@ -45,6 +45,7 @@ deploy: manifests
 manifests: controller-gen
 	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
 	kustomize build config/crd | sed -e '/creationTimestamp/d' > manifests/setup/fluentbit-operator-crd.yaml
+	kustomize build manifests/setup | sed -e '/creationTimestamp/d' > manifests/setup/setup.yaml
 
 # Run go fmt against code
 fmt:

README.md

@@ -57,9 +57,18 @@ Kubernetes v1.16.13+ is necessary for running Fluent Bit Operator, while it is a
 
 The quick start instructs you to deploy fluent bit with `dummy` as input and `stdout` as output, which is equivalent to execute the binary with `fluent-bit -i dummy -o stdout`.
 
+Install the latest stable version
+
 ```shell
-kubectl apply -f manifests/setup
-kubectl apply -f manifests/quick-start
+kubectl apply -f https://raw.githubusercontent.com/kubesphere/fluentbit-operator/release-0.7/manifests/setup/setup.yaml
+kubectl apply -f https://raw.githubusercontent.com/kubesphere/fluentbit-operator/release-0.7/manifests/quick-start/quick-start.yaml
+```
+
+Install the development version
+
+```shell
+kubectl apply -f https://raw.githubusercontent.com/kubesphere/fluentbit-operator/master/manifests/setup/setup.yaml
+kubectl apply -f https://raw.githubusercontent.com/kubesphere/fluentbit-operator/master/manifests/quick-start/quick-start.yaml
 ```
 
 Once everything is up, you'll observe messages in fluent bit pod logs like below:

manifests/quick-start/fluentbit-fluentBit.yaml

@@ -0,0 +1,50 @@
+apiVersion: logging.kubesphere.io/v1alpha2
+kind: FluentBit
+metadata:
+  name: fluent-bit
+  namespace: kubesphere-logging-system
+  labels:
+    app.kubernetes.io/name: fluent-bit
+spec:
+  image: kubespheredev/fluent-bit:v1.7.3
+  fluentBitConfigName: fluent-bit-config
+
+---
+apiVersion: logging.kubesphere.io/v1alpha2
+kind: FluentBitConfig
+metadata:
+  name: fluent-bit-config
+  namespace: kubesphere-logging-system
+  labels:
+    app.kubernetes.io/name: fluent-bit
+spec:
+  inputSelector:
+    matchLabels:
+      logging.kubesphere.io/enabled: "true"
+  outputSelector:
+    matchLabels:
+      logging.kubesphere.io/enabled: "true"
+
+---
+apiVersion: logging.kubesphere.io/v1alpha2
+kind: Input
+metadata:
+  name: dummy
+  namespace: kubesphere-logging-system
+  labels:
+    logging.kubesphere.io/enabled: "true"
+spec:
+  dummy:
+    tag: my_dummy
+
+---
+apiVersion: logging.kubesphere.io/v1alpha2
+kind: Output
+metadata:
+  name: stdout
+  namespace: kubesphere-logging-system
+  labels:
+    logging.kubesphere.io/enabled: "true"
+spec:
+  match: "*"
+  stdout: {}

manifests/quick-start/fluentbitconfig-fluentBitConfig.yaml

@@ -2,6 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
+- namespace-namespace.yaml
 - fluentbit-operator-clusterRoleBinding.yaml
 - fluentbit-operator-deployment.yaml
 - fluentbit-operator-crd.yaml