Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjust Fluentd source format for Docker files to be JSON for Cloud Lo… #9687

Merged
merged 1 commit into from Jun 15, 2015

Conversation

satnam6502
Copy link
Contributor

…gging

@lavalamp because I have decided to diverge from the image update procedure followed elsewhere -- if we use the user kubernetes on Dockerhub then we don't need to use a Git hash -- right?
@mr-salty and @a-robinson for the config change

@satnam6502 satnam6502 force-pushed the fluentd-gcp branch 3 times, most recently from 1c1beef to a8cc9ee Compare June 11, 2015 21:16
@a-robinson
Copy link
Contributor

config change LGTM

@@ -5,7 +5,7 @@ metadata:
spec:
containers:
- name: fluentd-cloud-logging
image: gcr.io/google_containers/fluentd-gcp:1.6
image: kubernetes/fluentd-gcp:1.7
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

...but we should never commit this to the code base, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct. After LGTM this should be changed to gcr.io/google_containers/fluentd-gcp:1.7
Does that make sense as a sane procedure for updating images?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated to gcr.io/google_containers/fluentd-gcp:1.7

@satnam6502
Copy link
Contributor Author

I can observe correctly ingested log data in the Cloud Logging console from a cluster made with this PR.

@satnam6502
Copy link
Contributor Author

I have now pushed the image to gcr.io.

$ make push
gcloud preview docker push gcr.io/google_containers/fluentd-gcp:1.7
The push refers to a repository [gcr.io/google_containers/fluentd-gcp] (len: 1)
Sending image list
Pushing repository gcr.io/google_containers/fluentd-gcp (1 tags)
Image a82efea989f9 already pushed, skipping
Image 07f8e8c5e660 already pushed, skipping
Image e9e06b06e14c already pushed, skipping
Image 37bea4ee0c81 already pushed, skipping
Image ce0e14722649 already pushed, skipping
Image 69f1c631d8bc already pushed, skipping
Image 894d80e8c432 already pushed, skipping
Image 817b2477f96c already pushed, skipping
42f773993d12: Image successfully pushed 
06fc5cb79e8c: Image successfully pushed 
8b2e85f3a72e: Image successfully pushed 
Pushing tag for rev [8b2e85f3a72e] on {https://gcr.io/v1/repositories/google_containers/fluentd-gcp/tags/1.7}

@k8s-bot
Copy link

k8s-bot commented Jun 11, 2015

GCE e2e build/test failed for commit e3c827c3100324bc9b5764f6b281dee9af2ebb45.

@k8s-bot
Copy link

k8s-bot commented Jun 11, 2015

GCE e2e build/test failed for commit a8cc9eea168dbd5f298b10f3feaf90c6baa87d51.

@k8s-bot
Copy link

k8s-bot commented Jun 11, 2015

GCE e2e build/test failed for commit b9b197e96b0622ed1d4660ce58a7c5520677b939.

@satnam6502
Copy link
Contributor Author

All: is this LGTM-ed enough to merge?

# Rules for building the test image for deployment to Dockerhub with user kubernetes.

kbuild:
docker build -t kubernetes/fluentd-gcp:$(TAG) .
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gcr.io/google_containers

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Likwise, this is for the test build of the image.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh-- sorry, I missed the k.

@lavalamp
Copy link
Member

LGTM after fixing gcr.io/google_containers :)

@satnam6502
Copy link
Contributor Author

I think this is ready to merge?

@lavalamp lavalamp added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 12, 2015
@fabioy
Copy link
Contributor

fabioy commented Jun 15, 2015

Automatic merge failed. Can you check if rebase is needed? Thank you.

@satnam6502
Copy link
Contributor Author

Fetched and rebased from head, pushed.

@k8s-bot
Copy link

k8s-bot commented Jun 15, 2015

GCE e2e build/test passed for commit 33311b4.

fabioy added a commit that referenced this pull request Jun 15, 2015
Adjust Fluentd source format for Docker files to be JSON for Cloud Lo…
@fabioy fabioy merged commit 8d2c7ff into kubernetes:master Jun 15, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/logging lgtm "Looks good to me", indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants