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

Required support to start working on windows node support #3200

Merged
merged 1 commit into from
Sep 3, 2018
Merged

Required support to start working on windows node support #3200

merged 1 commit into from
Sep 3, 2018

Conversation

pablodav
Copy link
Contributor

This is the basic lines required to start working on integrating kubernetes-for-windows

pablodav/kubernetes-for-windows#8

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Aug 30, 2018
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Aug 30, 2018
@ant31
Copy link
Contributor

ant31 commented Aug 30, 2018

ci check this

ant31
ant31 reviewed Aug 30, 2018
View reviewed changes
roles/dnsmasq/templates/dnsmasq-autoscaler.yml.j2 Outdated
@@ -52,3 +52,8 @@ spec:
- --default-params={"linear":{"nodesPerReplica":{{ dnsmasq_nodes_per_replica }},"preventSinglePointFailure":true}}
- --logtostderr=true
- --v={{ kube_log_level }}
{% if kube_patch_win_nodes %}
Copy link
Contributor

Choose a reason for hiding this comment

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

no need to add a condition, use the node selector always

ant31
ant31 reviewed Aug 30, 2018
View reviewed changes
...ubernetes-apps/ingress_controller/ingress_nginx/templates/ds-ingress-nginx-controller.yml.j2 Outdated
@@ -29,6 +29,7 @@ spec:
nodeSelector:
{{ ingress_nginx_nodeselector | to_nice_yaml }}
{%- endif %}
node-role.kubernetes.io/ingress: "true"
Copy link
Contributor

Choose a reason for hiding this comment

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

?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think it came from some other place (I had to do big rebase and resolve many conflicts), will remove if.

ant31
ant31 reviewed Aug 30, 2018
View reviewed changes
roles/win_nodes/kubernetes_patch/tasks/main.yml
@@ -0,0 +1,34 @@
---

- name: Ensure that user manifests directory exists
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not sure to understand why we need to apply patches from here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It is only required for cases where we don't have a .yml to modify before creating the kube-proxy, I think kubeadm creates the daemonset, so I had to patch after creation.

Copy link
Contributor

Choose a reason for hiding this comment

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

ok thanks

@ant31
Copy link
Contributor

ant31 commented Aug 30, 2018

I would remove all conditions, it's ok to do the nodeSelector in every cases.

@pablodav
Copy link
Contributor Author

Ok, will remove the conditions, should I close and create new Pr?

@ant31
Copy link
Contributor

ant31 commented Aug 30, 2018

No that's fine just force push here and eventually squash commits:

git rebase -i HEAD~11
# fixup or squash commits and save
git push -f

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Sep 2, 2018
@pablodav
Copy link
Contributor Author

pablodav commented Sep 2, 2018

I have done the removal of conditions.
Also the rebase command, but I don't see any change in commits after the rebase, not sure if it worked out.

@pablodav
ensure there is pin priority for docker package to avoid upgrade of d…
7cbe3c2 
…ocker to incompatible version

ensure there is pin priority for docker package to avoid upgrade of docker to incompatible version

remove empty when line

ensure there is pin priority for docker package to avoid upgrade of docker to incompatible version

force kubeadm upgrade due to failure without --force flag

ensure there is pin priority for docker package to avoid upgrade of docker to incompatible version

added nodeSelector to have compatibility with hybrid cluster with win nodes, also fix for download with missing container type

fixes in syntax and LF for newline in files

fix on yamllint check

ensure there is pin priority for docker package to avoid upgrade of docker to incompatible version

some cleanup for innecesary lines

remove conditions for nodeselector
@pablodav
Copy link
Contributor Author

pablodav commented Sep 2, 2018

now squashed the commits.

@ant31
Copy link
Contributor

ant31 commented Sep 3, 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 Sep 3, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ant31

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 Sep 3, 2018
@ant31
Copy link
Contributor

ant31 commented Sep 3, 2018

can you open an issue on on kubeadm repo to request that the selector is added by default or via a flag ?

@k8s-ci-robot k8s-ci-robot merged commit db11394 into kubernetes-sigs:master Sep 3, 2018
@pablodav pablodav mentioned this pull request Sep 3, 2018
Closed
@pablodav
Copy link
Contributor Author

pablodav commented Sep 3, 2018

@ant31 created kubernetes/kubeadm#1090
let's see what happens there.

@pablodav pablodav mentioned this pull request Sep 3, 2018
Closed
@pablodav
Copy link
Contributor Author

pablodav commented Sep 3, 2018

@ant31
They have openned new feature to manage it: kubernetes/kubeadm#1091

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ant31 ant31 ant31 left review comments

@ArchiFleKs ArchiFleKs Awaiting requested review from ArchiFleKs

@jjungnickel jjungnickel Awaiting requested review from jjungnickel

Assignees

@ant31 ant31

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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@pablodav @ant31 @k8s-ci-robot