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

Add control-plane toleration for Prometheus for Windows tests #2075

Merged

Conversation

oprinmarius
Copy link
Member

What type of PR is this?
/kind feature

What this PR does / why we need it:
Adds control-plane tolerations for Prometheus when running Windows Tests in Azure

Which issue(s) this PR fixes:

part of #2035

Special notes for your reviewer:

Windows Soak tests running in Azure do not spawn Linux worker nodes.
Prometheus service has to be scheduled on the control-plane nodes.

Does this PR introduce a user-facing change?:


Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:


@k8s-ci-robot k8s-ci-robot added kind/feature Categorizes issue or PR as related to a new feature. 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. labels May 26, 2022
@k8s-ci-robot
Copy link
Contributor

Hi @oprinmarius. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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 size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label May 26, 2022
@marosset
Copy link
Contributor

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels May 26, 2022
@oprinmarius oprinmarius force-pushed the patch/control-plane-tolerations branch from 8dc1ba6 to c737fd1 Compare May 26, 2022 16:38
@marosset
Copy link
Contributor

/lgtm
The behavior of running windows containers on the worker nodes and linux containers on the control-plane nodes is consistent with kubernetes/kubernetes e2e tests.
This is documented at https://github.com/kubernetes-sigs/windows-testing#method-1-using-an-existing-cluster

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 26, 2022
@marosset
Copy link
Contributor

/assign @mborsz @mm4tt

@@ -1,5 +1,6 @@
{{$PROMETHEUS_SCRAPE_KUBELETS := DefaultParam .PROMETHEUS_SCRAPE_KUBELETS false}}
{{$PROMETHEUS_SCRAPE_WINDOWS_NODES := DefaultParam .PROMETHEUS_SCRAPE_WINDOWS_NODES false}}
{{$PROMETHEUS_SCRAPE_WINDOWS_NODE_EXPORTER := DefaultParam .PROMETHEUS_SCRAPE_WINDOWS_NODE_EXPORTER false}}

Choose a reason for hiding this comment

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

can we resuse the PROMETHEUS_SCRAPE_WINDOWS_NODES? feels awkward to have to different windows scrape settings

Copy link
Member Author

Choose a reason for hiding this comment

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

PROMETHEUS_SCRAPE_WINDOWS_NODE_EXPORTER is the variable we introduced when we switched to use Windows Exporter as a HostProcess and we need to use it for Azure jobs

PROMETHEUS_SCRAPE_WINDOWS_NODES variable is used by the GCE jobs to install WMI exporter on the nodes via gcloud ssh command

I used the new PROMETHEUS_SCRAPE_WINDOWS_NODE_EXPORTER variable to add taints to the control-plane nodes and to remove storage configuration for Prometheus so I don't alter the other jobs that might be running Windows tests in GCE

Choose a reason for hiding this comment

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

thanks for the clarification. If we can eventually remove the GCE specific code and use just the hostprocess install method, we can eventually drop PROMETHEUS_SCRAPE_WINDOWS_NODES. My understanding is that GCE doesn't support hpc currently but will in the future.

@jackfrancis
Copy link

/test soak-tests-capz-windows-2019

@jackfrancis
Copy link

FYI using this PR as a guinea pig to test these changes:

https://github.com/kubernetes/test-infra/pull/26397/files#r883159740

@oprinmarius oprinmarius force-pushed the patch/control-plane-tolerations branch from c737fd1 to 4f78878 Compare June 2, 2022 17:13
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 2, 2022
@jsturtevant
Copy link

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 2, 2022
@marosset
Copy link
Contributor

marosset commented Jun 2, 2022

/lgtm

@jsturtevant
Copy link

/assign @mborsz @mm4tt

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 9, 2022
@oprinmarius oprinmarius force-pushed the patch/control-plane-tolerations branch from 4f78878 to 0b20619 Compare June 28, 2022 11:48
@k8s-ci-robot k8s-ci-robot removed lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jun 28, 2022
@mborsz
Copy link
Member

mborsz commented Jun 28, 2022

/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 Jun 28, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jsturtevant, marosset, mborsz, oprinmarius

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 Jun 28, 2022
@k8s-ci-robot k8s-ci-robot merged commit 4dd3c06 into kubernetes:master Jun 28, 2022
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. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. 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.

None yet

7 participants