github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

update to version 7.3.2

Browse Source
This commit is contained in:
Pat Christopher 2019-11-07 11:29:58 -06:00
parent 67d750bb28
commit daa3065a7e
3 changed files with 8 additions and 6 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:7.2.0 FROM docker.elastic.co/elasticsearch/elasticsearch-oss:7.3.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 = quay.io/fluentd_elasticsearch PREFIX = quay.io/fluentd_elasticsearch
IMAGE = elasticsearch IMAGE = elasticsearch
TAG = v7.2.0 TAG = v7.3.2
build: build:
docker build --tag ${PREFIX}/${IMAGE}:${TAG} . docker build --tag ${PREFIX}/${IMAGE}:${TAG} .

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

@ -51,7 +51,7 @@ metadata:
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: elasticsearch-logging k8s-app: elasticsearch-logging
version: v7.2.0 version: v7.3.2
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
spec: spec:
serviceName: elasticsearch-logging serviceName: elasticsearch-logging
@ -59,24 +59,26 @@ spec:
selector: selector:
matchLabels: matchLabels:
k8s-app: elasticsearch-logging k8s-app: elasticsearch-logging
version: v7.2.0 version: v7.3.2
template: template:
metadata: metadata:
labels: labels:
k8s-app: elasticsearch-logging k8s-app: elasticsearch-logging
version: v7.2.0 version: v7.3.2
spec: spec:
serviceAccountName: elasticsearch-logging serviceAccountName: elasticsearch-logging
containers: containers:
- image: quay.io/fluentd_elasticsearch/elasticsearch:v7.2.0 - image: quay.io/fluentd_elasticsearch/elasticsearch:v7.3.2
name: elasticsearch-logging name: elasticsearch-logging
imagePullPolicy: Always imagePullPolicy: Always
resources: resources:
# need more cpu upon initialization, therefore burstable class # need more cpu upon initialization, therefore burstable class
limits: limits:
cpu: 1000m cpu: 1000m
memory: 3Gi
requests: requests:
cpu: 100m cpu: 100m
memory: 3Gi
ports: ports:
- containerPort: 9200 - containerPort: 9200
name: db name: db