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

{tcp,udp}-services cm appear twice #3522

Merged
merged 1 commit into from
Dec 5, 2018
Merged

Conversation

jmervine
Copy link
Contributor

@jmervine jmervine commented Dec 5, 2018

What this PR does / why we need it:

The {tcp,udp}-services ConfigMaps appear twice, while idempotent, it's unnecessary.

@k8s-ci-robot
Copy link
Contributor

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://git.k8s.io/community/CLA.md#the-contributor-license-agreement to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.


Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Dec 5, 2018
@jmervine
Copy link
Contributor Author

jmervine commented Dec 5, 2018

I signed it

@aledbf
Copy link
Member

aledbf commented Dec 5, 2018

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 5, 2018
@aledbf
Copy link
Member

aledbf commented Dec 5, 2018

@jmervine thanks!

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aledbf, jmervine

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 Dec 5, 2018
@aledbf
Copy link
Member

aledbf commented Dec 5, 2018

/check-cla

@jmervine
Copy link
Contributor Author

jmervine commented Dec 5, 2018

I signed it

(for real this time)

@jmervine
Copy link
Contributor Author

jmervine commented Dec 5, 2018

@aledbf I just noticed these configmaps are defined yet again in https://github.com/kubernetes/ingress-nginx/blob/master/deploy/configmap.yaml. Shall I remove

---
kind: ConfigMap
apiVersion: v1
metadata:
name: tcp-services
labels:
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
---
kind: ConfigMap
apiVersion: v1
metadata:
name: udp-services
labels:
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/part-of: ingress-nginx
as well?

@aledbf
Copy link
Member

aledbf commented Dec 5, 2018

/check-cla

@aledbf
Copy link
Member

aledbf commented Dec 5, 2018

I just noticed these configmaps are defined yet again in https://github.com/kubernetes/ingress-nginx/blob/master/deploy/configmap.yaml. Shall I remove

No. The mandatory.yaml file is generated from the other files in the directory with https://github.com/kubernetes/ingress-nginx/blob/master/hack/build-single-manifest-sh

@jmervine
Copy link
Contributor Author

jmervine commented Dec 5, 2018

Gotcha, appears to be a bug then in 0.21.0, as it's missing those configmaps

https://github.com/kubernetes/ingress-nginx/blob/nginx-0.21.0/deploy/mandatory.yaml

@jmervine
Copy link
Contributor Author

jmervine commented Dec 5, 2018

okay, let's try this again

/check-cla

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Dec 5, 2018
@k8s-ci-robot k8s-ci-robot merged commit f5d2fa1 into kubernetes:master Dec 5, 2018
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/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants