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.

Sign up for GitHub

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

Jump to bottom

salt,docs,tests: Allow to disable CoreDNS host forwarding #4019

Merged
merged 1 commit into from
Mar 13, 2023
Merged

salt,docs,tests: Allow to disable CoreDNS host forwarding #4019

merged 1 commit into from
Mar 13, 2023

Conversation

TeddyAndrieux
Copy link
Collaborator

No description provided.

@TeddyAndrieux TeddyAndrieux requested a review from a team as a code owner March 9, 2023 18:24
@bert-e
Copy link
Contributor

bert-e commented Mar 9, 2023

Hello teddyandrieux,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Mar 9, 2023

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@TeddyAndrieux
Copy link
Collaborator Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Mar 10, 2023

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

The following options are set: approve

@TeddyAndrieux TeddyAndrieux force-pushed the improvement/handle-no-nameserver-env branch from e0eb70d to 4385839 Compare March 10, 2023 11:28
gdemonet
gdemonet previously approved these changes Mar 13, 2023
View reviewed changes
Copy link
Contributor

@gdemonet gdemonet left a comment

Choose a reason for hiding this comment

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

LGTM, would just like a bit more details (for posterity) about kubelet needing a resolv.conf :)

docs/installation/bootstrap.rst
Comment on lines +216 to +217
It means pod running in Kubernetes will not be able to resolve any name
that are not in Kubernetes.
Copy link
Contributor

Choose a reason for hiding this comment

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

There still is a way to make it work with ExternalName Service objects 😉

Copy link
Collaborator Author

@TeddyAndrieux TeddyAndrieux Mar 13, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

If it's in a Service as ExternalName then it's in Kubernetes 😃

salt/metalk8s/kubernetes/coredns/files/coredns-deployment.yaml.j2
Comment on lines +20 to +24
annotations:
# NOTE: Add annotation for config checksum, so that Pod get restarted on
# ConfigMap change
checksum/config: __slot__:salt:metalk8s_kubernetes.get_object_digest(kind="ConfigMap",
apiVersion="v1", namespace="kube-system", name="coredns", path="data")
Copy link
Contributor

Choose a reason for hiding this comment

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

💯

salt/metalk8s/kubernetes/kubelet/standalone.sls
Comment on lines +11 to +15
Ensure resolv config file exists:
file.managed:
- name: {{ kubelet.config.resolvConf }}
- create: true
- replace: false
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you explain this part? I see we're defining it to be /etc/resolv.conf, and we're passing it to kubelet, but not sure what it does... And also is it safe to just create an empty one? Like, how would this interact with the rest of the system services?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

It just creates an empty resolv.conf because Kubelet needs a file otherwise it fails, and for my testing it works well with an empty file

Copy link
Contributor

Choose a reason for hiding this comment

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

OK, let's keep the conversation open for future readers, but I trust your testing 😉

@TeddyAndrieux TeddyAndrieux force-pushed the improvement/handle-no-nameserver-env branch from 4385839 to 10c7e5f Compare March 13, 2023 09:43
@bert-e
Copy link
Contributor

bert-e commented Mar 13, 2023

Build failed

The build for commit did not succeed in branch improvement/handle-no-nameserver-env.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Mar 13, 2023

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/125.0

The following branches will NOT be impacted:

  • development/123.0
  • development/124.0
  • development/124.1
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Mar 13, 2023

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/125.0

The following branches have NOT changed:

  • development/123.0
  • development/124.0
  • development/124.1
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

Please check the status of the associated issue None.

Goodbye teddyandrieux.

@bert-e bert-e merged commit 10c7e5f into development/125.0 Mar 13, 2023
@bert-e bert-e deleted the improvement/handle-no-nameserver-env branch March 13, 2023 12:34
@TeddyAndrieux TeddyAndrieux mentioned this pull request May 4, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gdemonet gdemonet gdemonet approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@TeddyAndrieux @bert-e @gdemonet