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
64918cc2
Commit
64918cc2
authored
Jan 28, 2019
by
patc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update makefiles to use cloud build and update README
parent
7f873f23
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
19 deletions
+16
-19
README.md
cluster/addons/fluentd-elasticsearch/README.md
+8
-0
Makefile
cluster/addons/fluentd-elasticsearch/es-image/Makefile
+4
-12
Makefile
...er/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
+4
-7
No files found.
cluster/addons/fluentd-elasticsearch/README.md
View file @
64918cc2
...
...
@@ -58,6 +58,14 @@ DaemonSet will ignore them.
Learn more in the
[
official Kubernetes documentation
][
k8sElasticsearchDocs
]
.
## Building
Both images are now being hosted in google cloud and are built via the
[
cloud build
](
https://cloud.google.com/cloud-build/
)
product. To build these
images yourself you will need to have the
[
gcloud sdk
](
https://cloud.google.com/sdk/install
)
installed and you will need to login. You can then run
`make`
in either
image directory to trigger a container build.
### Known problems
Since Fluentd talks to the Elasticsearch service inside the cluster, instances
...
...
cluster/addons/fluentd-elasticsearch/es-image/Makefile
View file @
64918cc2
...
...
@@ -12,20 +12,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
.PHONY
:
b
inary build push
.PHONY
:
b
uild
PREFIX
=
staging-k8s.gcr.io
PREFIX
=
gcr.io/fluentd-elasticsearch
IMAGE
=
elasticsearch
TAG
=
v6.3.0
build
:
docker build
--pull
-t
$(PREFIX)
/
$(IMAGE)
:
$(TAG)
.
push
:
docker push
$(PREFIX)
/
$(IMAGE)
:
$(TAG)
binary
:
CGO_ENABLED
=
0
GOOS
=
linux go build
-a
-ldflags
"-w"
elasticsearch_logging_discovery.go
clean
:
rm
elasticsearch_logging_discovery
gcloud builds submit
--tag
${
PREFIX
}
/
${
IMAGE
}
:
${
TAG
}
\ No newline at end of file
cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
View file @
64918cc2
...
...
@@ -12,14 +12,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
.PHONY
:
build
push
.PHONY
:
build
PREFIX
=
staging-k8s.gcr.io
IMAGE
=
fluentd
-elasticsearch
PREFIX
=
gcr.io/fluentd-elasticsearch
IMAGE
=
fluentd
TAG
=
v2.4.0
build
:
docker build
--pull
-t
$(PREFIX)
/
$(IMAGE)
:
$(TAG)
.
push
:
docker push
$(PREFIX)
/
$(IMAGE)
:
$(TAG)
gcloud builds submit
--tag
$(PREFIX)
/
$(IMAGE)
:
$(TAG)
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