Merge pull request #5 from gianlucam76/documentation

Add one extra test

Author: gianlucam76

Makefile

@@ -147,7 +147,7 @@ create-cluster: $(KIND) $(KUBECTL) ## Create a new kind cluster designed for dev
 @echo "apply PersistentVolumeClaim"
 $(KUBECTL) apply -f test/pvc.yaml
 
-$(KUBECTL) apply -f test/configmap.yaml
+$(KUBECTL) create configmap k8s-collector --from-file test/configmap.yaml
 
 @echo 'Load k8s-collector image into cluster'
 $(MAKE) load-image

pkg/utils/collect_test.go

@@ -16,6 +16,20 @@ import (
 "github.com/gianlucam76/k8s_collector/pkg/utils"
 )
 
+var (
+data = `resources:
+- group: ""
+ version: v1
+ kind: Pod
+ namespace: default
+- group: apps
+ version: v1
+ kind: Deployment
+logs:
+- namespace: kube-system
+ sinceSeconds:600`
+)
+
 var _ = Describe("Collect", func() {
 It("loadConfiguration loads configuration from ConfigMap (YAML)", func() {
 sinceSecond := int64(600)
@@ -29,7 +43,7 @@ var _ = Describe("Collect", func() {
 },
 }
 
-jsonBytes, err := yaml.Marshal(collectorConfig)
+dataBytes, err := yaml.Marshal(collectorConfig)
 Expect(err).To(BeNil())
 
 configMap := &corev1.ConfigMap{
@@ -38,7 +52,7 @@ var _ = Describe("Collect", func() {
 Name: "foo",
 },
 Data: map[string]string{
-"config": string(jsonBytes),
+"config": string(dataBytes),
 },
 }
 
@@ -69,7 +83,7 @@ var _ = Describe("Collect", func() {
 },
 }
 
-jsonBytes, err := json.Marshal(collectorConfig)
+dataBytes, err := json.Marshal(collectorConfig)
 Expect(err).To(BeNil())
 
 configMap := &corev1.ConfigMap{
@@ -78,7 +92,7 @@ var _ = Describe("Collect", func() {
 Name: "bar",
 },
 Data: map[string]string{
-"config": string(jsonBytes),
+"config": string(dataBytes),
 },
 }
 
@@ -95,4 +109,33 @@ var _ = Describe("Collect", func() {
 Expect(err).To(BeNil())
 Expect(collectorConfig).ToNot(BeNil())
 })
+
+It("loadConfiguration loads configuration from ConfigMap ", func() {
+dataBytes, err := yaml.Marshal(data)
+Expect(err).To(BeNil())
+
+configMap := &corev1.ConfigMap{
+ObjectMeta: metav1.ObjectMeta{
+Namespace: "default",
+Name: "test",
+},
+Data: map[string]string{
+"config": string(dataBytes),
+},
+}
+
+collector, err := utils.GetCollectorInstance(scheme, env.Config, "", configMap.Name)
+Expect(err).To(BeNil())
+Expect(k8sClient.Create(context.TODO(), configMap)).To(Succeed())
+
+waitForObject(context.TODO(), k8sClient, configMap)
+
+os.Setenv("COLLECTOR_NAMESPACE", configMap.Namespace)
+config := textlogger.NewConfig(textlogger.Verbosity(1))
+logger := textlogger.NewLogger(config)
+collectorConfig, err := utils.LoadConfiguration(collector, context.TODO(), logger)
+Expect(err).To(BeNil())
+Expect(collectorConfig).ToNot(BeNil())
+Expect(len(collectorConfig.Resources)).To(Equal(2))
+})
 })

test/configmap.yaml

@@ -1,7 +1,11 @@
-apiVersion: v1
-data:
- config.yaml: '{"resources":[{"group":"","version":"v1","kind":"Secret"},{"group":"apps","version":"v1","kind":"Deployment"}],"logs":[{"namespace":"kube-system","sinceSeconds":600}]}'
-kind: ConfigMap
-metadata:
- name: k8s-collector
- namespace: default
+resources:
+- group: ""
+ version: v1
+ kind: Pod
+ namespace: default
+- group: apps
+ version: v1
+ kind: Deployment
+logs:
+- namespace: kube-system
+ sinceSeconds: 600