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

chore: set master distro to aks-ubuntu-18.04 for master branch jobs #178

Merged
merged 2 commits into from
Jul 7, 2020
Merged

chore: set master distro to aks-ubuntu-18.04 for master branch jobs #178

merged 2 commits into from
Jul 7, 2020

Conversation

chewong
Copy link
Member

@chewong chewong commented Jul 1, 2020

/assign @jsturtevant

@k8s-ci-robot
Copy link
Contributor

@chewong: GitHub didn't allow me to assign the following users: jsturtevant.

Note that only kubernetes-sigs members, repo collaborators and people who have commented on this issue/PR can be assigned. Additionally, issues/PRs can only have 10 assignees at the same time.
For more information please see the contributor guide

In response to this:

/assign @jsturtevant

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.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jul 1, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chewong

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 1, 2020
@jsturtevant
Copy link
Contributor

I think we are going to need to taint the nodes or we will have scheduling issues:

windows-testing/extensions/master_extension/v1/win-e2e-master-extension.sh

Line 30 in da35c85

${KUBECTL} taint nodes "$master_node" node-role.kubernetes.io/master=:NoSchedule

@jsturtevant
Copy link
Contributor

This could potentially solve #177

@adelina-t
Copy link
Contributor

I think we are going to need to taint the nodes or we will have scheduling issues:

windows-testing/extensions/master_extension/v1/win-e2e-master-extension.sh

Line 30 in da35c85

${KUBECTL} taint nodes "$master_node" node-role.kubernetes.io/master=:NoSchedule

Yes, taint should be applied to master node or else Windows workloads would be scheduled on Linux. Tests don't have nodeSelector for OS, as that's a tad of a complicated change with the current framework.

@chewong
Copy link
Member Author

chewong commented Jul 2, 2020

/hold

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 2, 2020
@chewong chewong changed the title chore: remove CSE from master node in 2004 API model chore: set master distro to aks-ubuntu-18.04 Jul 6, 2020
@chewong
Copy link
Member Author

chewong commented Jul 6, 2020

/assign @adelina-t

chewong
chewong commented Jul 6, 2020
View reviewed changes
job-templates/kubernetes_release.json
@@ -1,77 +0,0 @@
{
Copy link
Member Author

Choose a reason for hiding this comment

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

Deleting unused API model

chewong
chewong commented Jul 6, 2020
View reviewed changes
job-templates/kubernetes_master.json
@@ -1,86 +0,0 @@
{
Copy link
Member Author

Choose a reason for hiding this comment

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

Deleting unused API model

@chewong chewong changed the title chore: set master distro to aks-ubuntu-18.04 chore: set master distro to aks-ubuntu-18.04 for master branch jobs Jul 6, 2020
jsturtevant
jsturtevant reviewed Jul 6, 2020
View reviewed changes
job-templates/kubernetes_1903_master.json
@@ -23,7 +23,7 @@
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v3",
"distro": "ubuntu",
"distro": "aks-ubuntu-18.04",
Copy link
Contributor

Choose a reason for hiding this comment

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

Is possible to set the VHD imageVersion explicitly? This way we know the version that is deployed is consistent across tests?

Copy link
Member Author

Choose a reason for hiding this comment

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

AFAIK aks-engine API model doesn't allow users to override the Linux image version

@jsturtevant jsturtevant mentioned this pull request Jul 7, 2020
Closed
jsturtevant
jsturtevant reviewed Jul 7, 2020
View reviewed changes
extensions/master_extension/v1/win-e2e-master-extension.sh Outdated
fi
sleep 2
done
${KUBECTL} wait --for=condition=ready pod --all -n kube-system --timeout 10m >> /tmp/master_extension.log
Copy link
Contributor

Choose a reason for hiding this comment

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

there is an issue with using timeout with kubectl: kubernetes/kubectl#754

This will end up waiting much longer than might be expected in worse case: # of system pods * 10mins

Copy link
Contributor

Choose a reason for hiding this comment

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

This might not be an issue as before it would have been stuck in an infinite loop if pods didn't become ready.

@adelina-t do you have any input?

@jsturtevant
Copy link
Contributor

/lgtm

@k8s-ci-robot
Copy link
Contributor

@jsturtevant: changing LGTM is restricted to collaborators

In response to this:

/lgtm

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.

@chewong
Copy link
Member Author

chewong commented Jul 7, 2020

/unhold

@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 Jul 7, 2020
@chewong
Copy link
Member Author

chewong commented Jul 7, 2020

@adelina-t could you help review this PR? Thanks

@adelina-t
Copy link
Contributor

Looks ok.
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 7, 2020
@k8s-ci-robot k8s-ci-robot merged commit 3849d32 into kubernetes-sigs:master Jul 7, 2020
@chewong chewong deleted the remove-pre-pull branch July 7, 2020 20:53
This was referenced Jul 8, 2020
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jsturtevant jsturtevant jsturtevant left review comments

@marosset marosset Awaiting requested review from marosset

@PatrickLang PatrickLang Awaiting requested review from PatrickLang

Assignees

@adelina-t adelina-t

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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@chewong @k8s-ci-robot @jsturtevant @adelina-t