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
1c2ea280
Commit
1c2ea280
authored
Jan 11, 2017
by
Jeff Grafton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update images that use ubuntu-slim base image to :0.6
parent
330c9227
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
21 additions
and
23 deletions
+21
-23
fluentd-es-ds.yaml
cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml
+4
-4
Dockerfile
.../addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile
+1
-1
Makefile
...er/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
+1
-1
kibana-controller.yaml
cluster/addons/fluentd-elasticsearch/kibana-controller.yaml
+1
-1
Dockerfile
cluster/addons/fluentd-elasticsearch/kibana-image/Dockerfile
+1
-1
Makefile
cluster/addons/fluentd-elasticsearch/kibana-image/Makefile
+1
-1
fluentd-gcp-ds.yaml
cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
+1
-1
Dockerfile
cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile
+1
-1
Makefile
cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
+1
-1
fluentd-gcp.yaml
cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
+1
-1
Dockerfile
test/images/iperf/Dockerfile
+1
-1
Dockerfile
test/images/logs-generator/Dockerfile
+2
-3
Makefile
test/images/logs-generator/Makefile
+1
-1
README.md
test/images/logs-generator/README.md
+4
-5
No files found.
cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml
View file @
1c2ea280
apiVersion
:
extensions/v1beta1
kind
:
DaemonSet
metadata
:
name
:
fluentd-es-v1.2
0
name
:
fluentd-es-v1.2
2
namespace
:
kube-system
labels
:
k8s-app
:
fluentd-es
kubernetes.io/cluster-service
:
"
true"
version
:
v1.2
0
version
:
v1.2
2
spec
:
template
:
metadata
:
labels
:
k8s-app
:
fluentd-es
kubernetes.io/cluster-service
:
"
true"
version
:
v1.2
0
version
:
v1.2
2
spec
:
containers
:
-
name
:
fluentd-es
image
:
gcr.io/google_containers/fluentd-elasticsearch:1.2
0
image
:
gcr.io/google_containers/fluentd-elasticsearch:1.2
2
command
:
-
'
/bin/sh'
-
'
-c'
...
...
cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile
View file @
1c2ea280
...
...
@@ -22,7 +22,7 @@
# Please see http://docs.fluentd.org/articles/install-by-deb for more
# information about installing fluentd using deb package.
FROM
gcr.io/google_containers/ubuntu-slim:0.
4
FROM
gcr.io/google_containers/ubuntu-slim:0.
6
# Ensure there are enough file descriptors for running Fluentd.
RUN
ulimit
-n
65536
...
...
cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
View file @
1c2ea280
...
...
@@ -16,7 +16,7 @@
PREFIX
=
gcr.io/google_containers
IMAGE
=
fluentd-elasticsearch
TAG
=
1.2
1
TAG
=
1.2
2
build
:
docker build
--pull
-t
$(PREFIX)
/
$(IMAGE)
:
$(TAG)
.
...
...
cluster/addons/fluentd-elasticsearch/kibana-controller.yaml
View file @
1c2ea280
...
...
@@ -18,7 +18,7 @@ spec:
spec
:
containers
:
-
name
:
kibana-logging
image
:
gcr.io/google_containers/kibana:v4.6.1
image
:
gcr.io/google_containers/kibana:v4.6.1
-1
resources
:
# keep request = limit to keep this container in guaranteed class
limits
:
...
...
cluster/addons/fluentd-elasticsearch/kibana-image/Dockerfile
View file @
1c2ea280
...
...
@@ -15,7 +15,7 @@
# A Dockerfile for creating a Kibana container that is designed
# to work with Kubernetes logging.
FROM
gcr.io/google_containers/ubuntu-slim:0.
4
FROM
gcr.io/google_containers/ubuntu-slim:0.
6
ENV
DEBIAN_FRONTEND noninteractive
...
...
cluster/addons/fluentd-elasticsearch/kibana-image/Makefile
View file @
1c2ea280
...
...
@@ -14,7 +14,7 @@
.PHONY
:
build push
TAG
=
v4.6.1
TAG
=
v4.6.1
-1
PREFIX
=
gcr.io/google_containers
build
:
...
...
cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
View file @
1c2ea280
...
...
@@ -18,7 +18,7 @@ spec:
spec
:
containers
:
-
name
:
fluentd-gcp
image
:
gcr.io/google_containers/fluentd-gcp:1.3
1
image
:
gcr.io/google_containers/fluentd-gcp:1.3
2
# If fluentd consumes its own logs, the following situation may happen:
# fluentd fails to send a chunk to the server => writes it to the log =>
# tries to send this message to the server => fails to send a chunk and so on.
...
...
cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile
View file @
1c2ea280
...
...
@@ -20,7 +20,7 @@
# scope and that the Logging API has been enabled for the project
# in the Google Developer Console.
FROM
gcr.io/google_containers/ubuntu-slim:0.
4
FROM
gcr.io/google_containers/ubuntu-slim:0.
6
# Disable prompts from apt
...
...
cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
View file @
1c2ea280
...
...
@@ -26,7 +26,7 @@
.PHONY
:
build push
PREFIX
=
gcr.io/google_containers
TAG
=
1.3
1
TAG
=
1.3
2
build
:
docker build
--pull
-t
$(PREFIX)
/fluentd-gcp:
$(TAG)
.
...
...
cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
View file @
1c2ea280
...
...
@@ -10,7 +10,7 @@ spec:
dnsPolicy
:
Default
containers
:
-
name
:
fluentd-cloud-logging
image
:
gcr.io/google_containers/fluentd-gcp:1.3
1
image
:
gcr.io/google_containers/fluentd-gcp:1.3
2
# If fluentd consumes its own logs, the following situation may happen:
# fluentd fails to send a chunk to the server => writes it to the log =>
# tries to send this message to the server => fails to send a chunk and so on.
...
...
test/images/iperf/Dockerfile
View file @
1c2ea280
...
...
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM
gcr.io/google_containers/ubuntu-slim:0.
2
FROM
gcr.io/google_containers/ubuntu-slim:0.
6
RUN
apt-get update
&&
apt-get
install
-y
--no-install-recommends
iperf bash
\
&&
apt-get clean
-y
\
&&
rm
-rf
/var/lib/apt/lists/
*
\
...
...
test/images/logs-generator/Dockerfile
View file @
1c2ea280
...
...
@@ -12,11 +12,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM
gcr.io/google_containers/ubuntu-slim:0.
4
FROM
gcr.io/google_containers/ubuntu-slim:0.
6
COPY
logs-generator /
CMD
/logs-generator --logtostderr \
--log-lines-total=${LOGS_GENERATOR_LINES_TOTAL} \
--run-duration=${LOGS_GENERATOR_DURATION}
\ No newline at end of file
--run-duration=${LOGS_GENERATOR_DURATION}
test/images/logs-generator/Makefile
View file @
1c2ea280
...
...
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
TAG
=
v0.1.
0
TAG
=
v0.1.
1
PREFIX
=
gcr.io/google_containers
all
:
build
...
...
test/images/logs-generator/README.md
View file @
1c2ea280
...
...
@@ -33,7 +33,7 @@ line in a given run of the container.
Image is located in the public repository of Google Container Registry under the name
```
gcr.io/google_containers/logs-generator:v0.1.
0
gcr.io/google_containers/logs-generator:v0.1.
1
```
## Examples
...
...
@@ -42,16 +42,16 @@ gcr.io/google_containers/logs-generator:v0.1.0
docker run -i \
-e "LOGS_GENERATOR_LINES_TOTAL=10" \
-e "LOGS_GENERATOR_DURATION=1s" \
gcr.io/google_containers/logs-generator:v0.1.
0
gcr.io/google_containers/logs-generator:v0.1.
1
```
```
kubectl run logs-generator \
--generator=run-pod/v1 \
--image=gcr.io/google_containers/logs-generator:v0.1.
0
\
--image=gcr.io/google_containers/logs-generator:v0.1.
1
\
--restart=Never \
--env "LOGS_GENERATOR_LINES_TOTAL=1000" \
--env "LOGS_GENERATOR_DURATION=1m"
```
[

]()
\ No newline at end of file
[

]()
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