github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed elasticsearch cluster logging e2e test on GCI

pull/6/head
Mik Vyatskov 2016-09-21 13:55:43 +02:00
parent 2d9d84dc64
commit 3fbde5ecfb
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/addons/fluentd-elasticsearch/es-controller.yaml
View File

@ -23,9 +23,9 @@ spec:
- image: gcr.io/google_containers/elasticsearch:1.9 - image: gcr.io/google_containers/elasticsearch:1.9
name: elasticsearch-logging name: elasticsearch-logging
resources: resources:
# keep request = limit to keep this container in guaranteed class # need more cpu upon initialization, therefore burstable class
limits: limits:
cpu: 100m cpu: 1000m
requests: requests:
cpu: 100m cpu: 100m
ports: ports:

8
test/e2e/es_cluster_logging.go
View File

@ -219,11 +219,6 @@ func ClusterLevelLoggingWithElasticsearch(f *framework.Framework) {
} }
framework.Logf("Found %d healthy nodes.", len(nodes.Items)) framework.Logf("Found %d healthy nodes.", len(nodes.Items))
// TODO: Figure out why initialization time influences
// results of the test and remove this step
By("Wait some more time to ensure ES and fluentd are ready")
time.Sleep(2 * time.Minute)
// Wait for the Fluentd pods to enter the running state. // Wait for the Fluentd pods to enter the running state.
By("Checking to make sure the Fluentd pod are running on each healthy node") By("Checking to make sure the Fluentd pod are running on each healthy node")
label = labels.SelectorFromSet(labels.Set(map[string]string{k8sAppKey: fluentdValue})) label = labels.SelectorFromSet(labels.Set(map[string]string{k8sAppKey: fluentdValue}))
@ -306,9 +301,6 @@ func ClusterLevelLoggingWithElasticsearch(f *framework.Framework) {
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
} }
// Wait a bit for the log information to make it into Elasticsearch.
time.Sleep(30 * time.Second)
// Make several attempts to observe the logs ingested into Elasticsearch. // Make several attempts to observe the logs ingested into Elasticsearch.
By("Checking all the log lines were ingested into Elasticsearch") By("Checking all the log lines were ingested into Elasticsearch")
totalMissing := 0 totalMissing := 0