Skip to content

Commit d95cb7d

Browse files
benjaminhuobenjaminhuo
authored
Merge pull request #463 from wenchajun/release-1.7.0
release 1.7.0
2 parents e109d21 + 02b2bd8 commit d95cb7d

19 files changed

+558
-22
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
- Add environment variable support to the FluentBit CRD (#449)
55
- Make more fluent-bit configurations configurable via the FluentBit resource (#452)
66
- Feat: control/configure default ClusterFilters (helm chart) (#453)
7+
- Add fluent-bit service and option to extend the RBAC configurations (#462)
78

89
### ENHANCEMENT
910
- Splunk make eventfield plural (#447)

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
latest
1+
v1.7.0

‎apis/fluentbit/v1alpha2/fluentbit_types.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package v1alpha2
1818

1919
import (
2020
corev1 "k8s.io/api/core/v1"
21+
rbacv1 "k8s.io/api/rbac/v1"
2122
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2223

2324
"github.com/fluent/fluent-operator/pkg/utils"
@@ -28,6 +29,8 @@ import (
2829

2930
// FluentBitSpec defines the desired state of FluentBit
3031
type FluentBitSpec struct {
32+
// DisableService tells if the fluentbit service should be deployed.
33+
DisableService bool `json:"disableService,omitempty"`
3134
// Fluent Bit image.
3235
Image string `json:"image,omitempty"`
3336
// Fluent Bit Watcher command line arguments.
@@ -78,6 +81,8 @@ type FluentBitSpec struct {
7881
InitContainers []corev1.Container `json:"initContainers,omitempty"`
7982
// Ports represents the pod's ports.
8083
Ports []corev1.ContainerPort `json:"ports,omitempty"`
84+
// RBACRules represents additional rbac rules which will be applied to the fluent-bit clusterrole.
85+
RBACRules []rbacv1.PolicyRule `json:"rbacRules,omitempty"`
8186
}
8287

8388
// FluentBitStatus defines the observed state of FluentBit

‎apis/fluentbit/v1alpha2/zz_generated.deepcopy.go‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apis/fluentd/v1alpha1/fluentd_types.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"github.com/fluent/fluent-operator/apis/fluentd/v1alpha1/plugins/input"
2121
"github.com/fluent/fluent-operator/pkg/utils"
2222
corev1 "k8s.io/api/core/v1"
23+
rbacv1 "k8s.io/api/rbac/v1"
2324
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2425
)
2526

@@ -65,6 +66,8 @@ type FluentdSpec struct {
6566
RuntimeClassName string `json:"runtimeClassName,omitempty"`
6667
// PriorityClassName represents the pod's priority class.
6768
PriorityClassName string `json:"priorityClassName,omitempty"`
69+
// RBACRules represents additional rbac rules which will be applied to the fluentd clusterrole.
70+
RBACRules []rbacv1.PolicyRule `json:"rbacRules,omitempty"`
6871
}
6972

7073
type BufferVolume struct {

‎apis/fluentd/v1alpha1/zz_generated.deepcopy.go‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎charts/fluent-operator/crds/fluentbit.fluent.io_fluentbits.yaml‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -873,6 +873,10 @@ spec:
873873
containerLogRealPath:
874874
description: Container log path
875875
type: string
876+
disableService:
877+
description: DisableService tells if the fluentbit service should
878+
be deployed.
879+
type: boolean
876880
envVars:
877881
description: EnvVars represent environment variables that can be passed
878882
to fluentbit pods.
@@ -3872,6 +3876,57 @@ spec:
38723876
priorityClassName:
38733877
description: PriorityClassName represents the pod's priority class.
38743878
type: string
3879+
rbacRules:
3880+
description: RBACRules represents additional rbac rules which will
3881+
be applied to the fluent-bit clusterrole.
3882+
items:
3883+
description: PolicyRule holds information that describes a policy
3884+
rule, but does not contain information about who the rule applies
3885+
to or which namespace the rule applies to.
3886+
properties:
3887+
apiGroups:
3888+
description: APIGroups is the name of the APIGroup that contains
3889+
the resources. If multiple API groups are specified, any
3890+
action requested against one of the enumerated resources in
3891+
any API group will be allowed. "" represents the core API
3892+
group and "*" represents all API groups.
3893+
items:
3894+
type: string
3895+
type: array
3896+
nonResourceURLs:
3897+
description: NonResourceURLs is a set of partial urls that a
3898+
user should have access to. *s are allowed, but only as the
3899+
full, final step in the path Since non-resource URLs are not
3900+
namespaced, this field is only applicable for ClusterRoles
3901+
referenced from a ClusterRoleBinding. Rules can either apply
3902+
to API resources (such as "pods" or "secrets") or non-resource
3903+
URL paths (such as "/api"), but not both.
3904+
items:
3905+
type: string
3906+
type: array
3907+
resourceNames:
3908+
description: ResourceNames is an optional white list of names
3909+
that the rule applies to. An empty set means that everything
3910+
is allowed.
3911+
items:
3912+
type: string
3913+
type: array
3914+
resources:
3915+
description: Resources is a list of resources this rule applies
3916+
to. '*' represents all resources.
3917+
items:
3918+
type: string
3919+
type: array
3920+
verbs:
3921+
description: Verbs is a list of Verbs that apply to ALL the
3922+
ResourceKinds contained in this rule. '*' represents all verbs.
3923+
items:
3924+
type: string
3925+
type: array
3926+
required:
3927+
- verbs
3928+
type: object
3929+
type: array
38753930
readinessProbe:
38763931
description: ReadinessProbe represents the pod's readiness probe.
38773932
properties:

‎charts/fluent-operator/crds/fluentd.fluent.io_fluentds.yaml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1694,6 +1694,57 @@ spec:
16941694
priorityClassName:
16951695
description: PriorityClassName represents the pod's priority class.
16961696
type: string
1697+
rbacRules:
1698+
description: RBACRules represents additional rbac rules which will
1699+
be applied to the fluentd clusterrole.
1700+
items:
1701+
description: PolicyRule holds information that describes a policy
1702+
rule, but does not contain information about who the rule applies
1703+
to or which namespace the rule applies to.
1704+
properties:
1705+
apiGroups:
1706+
description: APIGroups is the name of the APIGroup that contains
1707+
the resources. If multiple API groups are specified, any
1708+
action requested against one of the enumerated resources in
1709+
any API group will be allowed. "" represents the core API
1710+
group and "*" represents all API groups.
1711+
items:
1712+
type: string
1713+
type: array
1714+
nonResourceURLs:
1715+
description: NonResourceURLs is a set of partial urls that a
1716+
user should have access to. *s are allowed, but only as the
1717+
full, final step in the path Since non-resource URLs are not
1718+
namespaced, this field is only applicable for ClusterRoles
1719+
referenced from a ClusterRoleBinding. Rules can either apply
1720+
to API resources (such as "pods" or "secrets") or non-resource
1721+
URL paths (such as "/api"), but not both.
1722+
items:
1723+
type: string
1724+
type: array
1725+
resourceNames:
1726+
description: ResourceNames is an optional white list of names
1727+
that the rule applies to. An empty set means that everything
1728+
is allowed.
1729+
items:
1730+
type: string
1731+
type: array
1732+
resources:
1733+
description: Resources is a list of resources this rule applies
1734+
to. '*' represents all resources.
1735+
items:
1736+
type: string
1737+
type: array
1738+
verbs:
1739+
description: Verbs is a list of Verbs that apply to ALL the
1740+
ResourceKinds contained in this rule. '*' represents all verbs.
1741+
items:
1742+
type: string
1743+
type: array
1744+
required:
1745+
- verbs
1746+
type: object
1747+
type: array
16971748
replicas:
16981749
description: Numbers of the Fluentd instance
16991750
format: int32

‎charts/fluent-operator/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ operator:
1212
tag: "20.10"
1313
container:
1414
repository: "kubesphere/fluent-operator"
15-
tag: "latest"
15+
tag: "v1.7.0"
1616
# FluentBit operator resources. Usually user needn't to adjust these.
1717
resources:
1818
limits:

‎config/crd/bases/fluentbit.fluent.io_fluentbits.yaml‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -873,6 +873,10 @@ spec:
873873
containerLogRealPath:
874874
description: Container log path
875875
type: string
876+
disableService:
877+
description: DisableService tells if the fluentbit service should
878+
be deployed.
879+
type: boolean
876880
envVars:
877881
description: EnvVars represent environment variables that can be passed
878882
to fluentbit pods.
@@ -3872,6 +3876,57 @@ spec:
38723876
priorityClassName:
38733877
description: PriorityClassName represents the pod's priority class.
38743878
type: string
3879+
rbacRules:
3880+
description: RBACRules represents additional rbac rules which will
3881+
be applied to the fluent-bit clusterrole.
3882+
items:
3883+
description: PolicyRule holds information that describes a policy
3884+
rule, but does not contain information about who the rule applies
3885+
to or which namespace the rule applies to.
3886+
properties:
3887+
apiGroups:
3888+
description: APIGroups is the name of the APIGroup that contains
3889+
the resources. If multiple API groups are specified, any
3890+
action requested against one of the enumerated resources in
3891+
any API group will be allowed. "" represents the core API
3892+
group and "*" represents all API groups.
3893+
items:
3894+
type: string
3895+
type: array
3896+
nonResourceURLs:
3897+
description: NonResourceURLs is a set of partial urls that a
3898+
user should have access to. *s are allowed, but only as the
3899+
full, final step in the path Since non-resource URLs are not
3900+
namespaced, this field is only applicable for ClusterRoles
3901+
referenced from a ClusterRoleBinding. Rules can either apply
3902+
to API resources (such as "pods" or "secrets") or non-resource
3903+
URL paths (such as "/api"), but not both.
3904+
items:
3905+
type: string
3906+
type: array
3907+
resourceNames:
3908+
description: ResourceNames is an optional white list of names
3909+
that the rule applies to. An empty set means that everything
3910+
is allowed.
3911+
items:
3912+
type: string
3913+
type: array
3914+
resources:
3915+
description: Resources is a list of resources this rule applies
3916+
to. '*' represents all resources.
3917+
items:
3918+
type: string
3919+
type: array
3920+
verbs:
3921+
description: Verbs is a list of Verbs that apply to ALL the
3922+
ResourceKinds contained in this rule. '*' represents all verbs.
3923+
items:
3924+
type: string
3925+
type: array
3926+
required:
3927+
- verbs
3928+
type: object
3929+
type: array
38753930
readinessProbe:
38763931
description: ReadinessProbe represents the pod's readiness probe.
38773932
properties:

0 commit comments

Comments
 (0)