github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #77765 from coffeepac/es-6.7.2

Browse Source 
upgrade elasticsearch for vuln handling
This commit is contained in:
Kubernetes Prow Robot 2019-05-11 17:20:10 -07:00 committed by GitHub
commit 5d9d5bca79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/addons/fluentd-elasticsearch/es-image/Dockerfile
View File

@ -17,7 +17,7 @@ COPY elasticsearch_logging_discovery.go go.mod go.sum /
RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -a -ldflags "-w" -o /elasticsearch_logging_discovery /elasticsearch_logging_discovery.go RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -a -ldflags "-w" -o /elasticsearch_logging_discovery /elasticsearch_logging_discovery.go
FROM docker.elastic.co/elasticsearch/elasticsearch-oss:6.6.1 FROM docker.elastic.co/elasticsearch/elasticsearch-oss:6.7.2
VOLUME ["/data"] VOLUME ["/data"]
EXPOSE 9200 9300 EXPOSE 9200 9300

2
cluster/addons/fluentd-elasticsearch/es-image/Makefile
View File

@ -16,7 +16,7 @@
PREFIX = gcr.io/fluentd-elasticsearch PREFIX = gcr.io/fluentd-elasticsearch
IMAGE = elasticsearch IMAGE = elasticsearch
TAG = v6.6.1 TAG = v6.7.2
build: build:
gcloud builds submit --tag ${PREFIX}/${IMAGE}:${TAG} gcloud builds submit --tag ${PREFIX}/${IMAGE}:${TAG}

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

@ -59,12 +59,12 @@ spec:
selector: selector:
matchLabels: matchLabels:
k8s-app: elasticsearch-logging k8s-app: elasticsearch-logging
version: v6.6.1 version: v6.7.2
template: template:
metadata: metadata:
labels: labels:
k8s-app: elasticsearch-logging k8s-app: elasticsearch-logging
version: v6.6.1 version: v6.7.2
spec: spec:
serviceAccountName: elasticsearch-logging serviceAccountName: elasticsearch-logging
containers: containers: