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

Welcome defaultbackend to the ingress-gce repo #503

Merged
merged 4 commits into from
Nov 14, 2018
Merged

Welcome defaultbackend to the ingress-gce repo #503

merged 4 commits into from
Nov 14, 2018

Conversation

jonpulsifer
Copy link
Contributor

This commit introduces the 404-server to the ingress-gce repository.

Previously, it was held in the kubernetes/ingress-nginx repo, but the
nginx ingress controller no longer requires it.

Fixes #498

Signed-off-by: Jonathan Pulsifer jonathan.pulsifer@shopify.com

 This commit introduces the 404-server to the ingress-gce repository.

 Previously, it was held in the kubernetes/ingress-nginx repo, but the
 nginx ingress controller no longer requires it.

 Fixes #498

Signed-off-by: Jonathan Pulsifer <jonathan.pulsifer@shopify.com>
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Sep 28, 2018
@aledbf
Copy link
Member

aledbf commented Oct 11, 2018

@bowei friendly ping

@bowei
Copy link
Member

bowei commented Oct 14, 2018

@jonpulsifer -- is it possible to split into two commits:

  1. with all the changes needs to wire in the new code
  2. just the code copied over

It's hard to review in the github UI otherwise

@rramkumar1
Copy link
Contributor

/ok-to-test

@k8s-ci-robot k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Oct 19, 2018
@jonpulsifer
Copy link
Contributor Author

This PR just introduces the new code, there's nothing wired in. What changes need to be made for this to be wired in? 😄

@rramkumar1
Copy link
Contributor

rramkumar1 commented Oct 19, 2018

@jonpulsifer Thanks for the PR. If I may, I'd like to make a suggestion on how to better structure this PR in order to be more consistent w/ how we structure the other binaries we manage in this repo.

You can take the echo server binary as an example (cmd/echo). Specifically, I would like to see the actual server code under cmd/404 or something like that w/ a corresponding Dockerfile + Makefile target in the top level. There is also no need for a cloudbuild.yaml given that we have our own internal build + push process.

Also, we don't really care for the prometheus metrics so is it possible to just get rid of that? That will save us from Godep as well.

Let me know if you have any questions.

Signed-off-by: Jonathan Pulsifer <jonathan@pulsifer.ca>
Signed-off-by: Jonathan Pulsifer <jonathan@pulsifer.ca>
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Nov 13, 2018
@jonpulsifer
Copy link
Contributor Author

Pardon the delay 😄

I think this is ok now? A few things:

  1. 404-server now builds like the other binaries
  2. metrics have been removed (byebye vendor/)
  3. works on my machine 😂

The last nit, I think, is that the image builds with the following image name gcr.io/google_containers/ingress-gce-404-server-amd64

I assume we would like it to maintain its original name defaultbackend and version but I don't know how you'd like to do this.

Ref https://console.cloud.google.com/gcr/images/google_containers/GLOBAL/defaultbackend

@@ -0,0 +1,12 @@
approvers:
Copy link
Contributor

Choose a reason for hiding this comment

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

We don't need a separate OWNERS for this. The top level OWNERS should suffice.

@rramkumar1
Copy link
Contributor

rramkumar1 commented Nov 13, 2018

@jonpulsifer Can you also add the binary name to the Makefile?

Regarding the naming of the image, i'll ask around and get back to you ASAP

Signed-off-by: Jonathan Pulsifer <jonathan@pulsifer.ca>
@jonpulsifer
Copy link
Contributor Author

The binary was added in 4bb3afe and the owners have been removed

@rramkumar1
Copy link
Contributor

@jonpulsifer Thanks alot, this looks great!

/lgtm
/hold

Will get back to you today regarding naming of the image.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 13, 2018
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 13, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jonpulsifer, rramkumar1

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 13, 2018
@rramkumar1
Copy link
Contributor

@jonpulsifer Naming is fine. I'll take care of updating any stale references

/hold remove

@rramkumar1
Copy link
Contributor

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 14, 2018
@k8s-ci-robot k8s-ci-robot merged commit a101b02 into kubernetes:master Nov 14, 2018
@jonpulsifer jonpulsifer deleted the hello-404-server branch November 14, 2018 18:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants