Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
5d9d5bca
Unverified
Commit
5d9d5bca
authored
May 11, 2019
by
Kubernetes Prow Robot
Committed by
GitHub
May 11, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #77765 from coffeepac/es-6.7.2
upgrade elasticsearch for vuln handling
parents
d01c0153
65fcbf4a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
Dockerfile
cluster/addons/fluentd-elasticsearch/es-image/Dockerfile
+1
-1
Makefile
cluster/addons/fluentd-elasticsearch/es-image/Makefile
+1
-1
es-statefulset.yaml
cluster/addons/fluentd-elasticsearch/es-statefulset.yaml
+2
-2
No files found.
cluster/addons/fluentd-elasticsearch/es-image/Dockerfile
View file @
5d9d5bca
...
...
@@ -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
FROM
docker.elastic.co/elasticsearch/elasticsearch-oss:6.
6.1
FROM
docker.elastic.co/elasticsearch/elasticsearch-oss:6.
7.2
VOLUME
["/data"]
EXPOSE
9200 9300
...
...
cluster/addons/fluentd-elasticsearch/es-image/Makefile
View file @
5d9d5bca
...
...
@@ -16,7 +16,7 @@
PREFIX
=
gcr.io/fluentd-elasticsearch
IMAGE
=
elasticsearch
TAG
=
v6.
6.1
TAG
=
v6.
7.2
build
:
gcloud builds submit
--tag
${
PREFIX
}
/
${
IMAGE
}
:
${
TAG
}
cluster/addons/fluentd-elasticsearch/es-statefulset.yaml
View file @
5d9d5bca
...
...
@@ -59,12 +59,12 @@ spec:
selector
:
matchLabels
:
k8s-app
:
elasticsearch-logging
version
:
v6.
6.1
version
:
v6.
7.2
template
:
metadata
:
labels
:
k8s-app
:
elasticsearch-logging
version
:
v6.
6.1
version
:
v6.
7.2
spec
:
serviceAccountName
:
elasticsearch-logging
containers
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment