Merge pull request #43 from caos/v0.9.11

V0.9.11
caos · Jan 29, 2020 · 412547f · 412547f
2 parents 17ab664 + b585652
commit 412547f
Show file tree

Hide file tree

Showing 13 changed files with 720 additions and 100 deletions.
diff --git a/api/v1beta1/grafana.go b/api/v1beta1/grafana.go
@@ -5,6 +5,7 @@ type Grafana struct {
 	Admin              *Admin        `json:"admin,omitempty"`
 	Datasources        []*Datasource `json:"datasources,omitempty"`
 	DashboardProviders []*Provider   `json:"dashboardproviders,omitempty"`
+	Storage            *StorageSpec  `json:"storage,omitempty"`
 }
 type Admin struct {
 	ExistingSecret string `json:"existingSecret,omitempty" yaml:"existingSecret,omitempty"`

diff --git a/api/v1beta1/logging-operator.go b/api/v1beta1/logging-operator.go
@@ -1,5 +1,6 @@
 package v1beta1
 
 type LoggingOperator struct {
-	Deploy bool `json:"deploy,omitempty"`
+	Deploy     bool         `json:"deploy,omitempty"`
+	FluentdPVC *StorageSpec `json:"fluentdStorage,omitempty" yaml:"fluentdStorage,omitempty"`
 }
diff --git a/dashboards/kubelet/json/kubelet.json b/dashboards/kubelet/json/kubelet.json