Allow to add config values through crds (#59)

Author: baluchicken

deploy/crds/logging_v1alpha1_fluentbit_cr.yaml

@@ -6,5 +6,14 @@ metadata:
     release: test
 spec:
   namespace: default
+  annotations:
+    prometheus.io/scrape: "true"
+    prometheus.io/path:   "/api/v1/metrics/prometheus"
+    prometheus.io/port:   "2020"
   tls:
     enabled: false
+  image:
+    tag: "latest"
+    repository: "fluent/fluent-bit"
+    pullPolicy: "IfNotPresent"
+  resources: {}

deploy/crds/logging_v1alpha1_fluentd_cr.yaml

@@ -6,5 +6,28 @@ metadata:
     release: test
 spec:
   namespace: default
+  annotations:
+    prometheus.io/scrape: "true"
+    prometheus.io/path:   "/metrics"
+    prometheus.io/port:   "25000"
   tls:
-    enabled: false
+    enabled: false
+  image:
+    tag: "v1.1.4"
+    repository: "banzaicloud/fluentd"
+    pullPolicy: "IfNotPresent"
+  volumeModImage:
+    tag: "latest"
+    repository: "busybox"
+    pullPolicy: "IfNotPresent"
+  configReloaderImage:
+    tag: "v0.2.2"
+    repository: "jimmidyson/configmap-reload"
+    pullPolicy: "IfNotPresent"
+  resources: {}
+  fluentdPvcSpec:
+    accessModes:
+      - ReadWriteOnce
+    resources:
+      requests:
+        storage: 21Gi

pkg/apis/logging/v1alpha1/common_types.go

@@ -0,0 +1,24 @@
+/*
+ * Copyright © 2019 Banzai Cloud
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package v1alpha1
+
+// ImageSpec struct hold information about image specification
+type ImageSpec struct {
+	Repository string `json:"repository"`
+	Tag        string `json:"tag"`
+	PullPolicy string `json:"pullPolicy"`
+}

pkg/apis/logging/v1alpha1/fluentbit_types.go

@@ -17,6 +17,9 @@
 package v1alpha1
 
 import (
+	"strconv"
+
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -29,8 +32,11 @@ type FluentbitSpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
 	// Important: Run "operator-sdk generate k8s" to regenerate code after modifying this file
 	// Add custom validation using kubebuilder tags: https://book.kubebuilder.io/beyond_basics/generating_crd.html
-	Namespace string       `json:"namespace"`
-	TLS       FluentbitTLS `json:"tls"`
+	Namespace   string                      `json:"namespace"`
+	Annotations map[string]string           `json:"annotations"`
+	Image       ImageSpec                   `json:"image"`
+	TLS         FluentbitTLS                `json:"tls"`
+	Resources   corev1.ResourceRequirements `json:"resources,omitempty"`
 }
 
 // FluentbitTLS defines the TLS configs
@@ -69,6 +75,15 @@ type FluentbitList struct {
 	Items           []Fluentbit `json:"items"`
 }
 
+// GetPrometheusPortFromAnnotation gets the port value from annotation
+func (spec FluentbitSpec) GetPrometheusPortFromAnnotation() int32 {
+	port, err := strconv.ParseInt(spec.Annotations["prometheus.io/port"], 10, 32)
+	if err != nil {
+		panic(err)
+	}
+	return int32(port)
+}
+
 func init() {
 	SchemeBuilder.Register(&Fluentbit{}, &FluentbitList{})
 }

pkg/apis/logging/v1alpha1/fluentd_types.go

@@ -17,6 +17,9 @@
 package v1alpha1
 
 import (
+	"strconv"
+
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -29,8 +32,14 @@ type FluentdSpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
 	// Important: Run "operator-sdk generate k8s" to regenerate code after modifying this file
 	// Add custom validation using kubebuilder tags: https://book.kubebuilder.io/beyond_basics/generating_crd.html
-	Namespace string     `json:"namespace"`
-	TLS       FluentdTLS `json:"tls"`
+	Namespace           string                           `json:"namespace"`
+	Annotations         map[string]string                `json:"annotations"`
+	TLS                 FluentdTLS                       `json:"tls"`
+	Image               ImageSpec                        `json:"image"`
+	FluentdPvcSpec      corev1.PersistentVolumeClaimSpec `json:"fluentdPvcSpec"`
+	VolumeModImage      ImageSpec                        `json:"volumeModImage"`
+	ConfigReloaderImage ImageSpec                        `json:"configReloaderImage"`
+	Resources           corev1.ResourceRequirements      `json:"resources,omitempty"`
 }
 
 // FluentdTLS defines the TLS configs
@@ -69,6 +78,15 @@ type FluentdList struct {
 	Items           []Fluentd `json:"items"`
 }
 
+// GetPrometheusPortFromAnnotation gets the port value from annotation
+func (spec FluentdSpec) GetPrometheusPortFromAnnotation() int32 {
+	port, err := strconv.ParseInt(spec.Annotations["prometheus.io/port"], 10, 32)
+	if err != nil {
+		panic(err)
+	}
+	return int32(port)
+}
+
 func init() {
 	SchemeBuilder.Register(&Fluentd{}, &FluentdList{})
 }