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

Don't abuse daemonset env condition #807

Merged
merged 7 commits into from
Jan 11, 2024
Merged

Conversation

toshipp
Copy link
Contributor

@toshipp toshipp commented Jan 9, 2024

Previous code used daemonset env condition in many places, but it did not directly express the meaning.
In this PR, change the condition or remove it to make it more readable.

Previously, we check if daemonset LVMd is used by the environment
variable. But if so, the configuration exists as the CM, we omit the
check.

Signed-off-by: Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp>
The requirement to schedule a pod at the node where the PVC exists still
applies when using storage capacity.

Signed-off-by: Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp>
When using daemonset LVMd, we use minikube. In the environment, there
are no multiple nodes and we enable storage capacity tracking feature.
The previous code abused the condition whether daemonset LVMd is used to
express such conditions, we now split it to make the code more readable.

Signed-off-by: Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp>
It is related to node count rather than using daemonset LVMd.

Signed-off-by: Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp>
When using daemonset LVMd, kindnet is not deployed in the environment
because we use minikube. However, it is not related, moreover, we can
check if waiting it by its existence.

Signed-off-by: Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp>
Signed-off-by: Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp>
@toshipp toshipp marked this pull request as ready for review January 9, 2024 10:42
@toshipp toshipp requested a review from a team as a code owner January 9, 2024 10:42
e2e/suite_test.go Outdated Show resolved Hide resolved
We discovered that control plane nodes possess varying values for the
node-role.kubernetes.io/control-plane label across different
environments. The document[1] do not provide any information regarding
the value. Therefore, alter the expression to test only the key.

[1]: https://kubernetes.io/docs/reference/labels-annotations-taints/#node-role-kubernetes-io-control-plane

Signed-off-by: Toshikuni Fukaya <toshikuni-fukaya@cybozu.co.jp>
@cupnes cupnes merged commit d40d797 into main Jan 11, 2024
24 checks passed
@cupnes cupnes deleted the dont-abuse-daemonset-env-condition branch January 11, 2024 02:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

3 participants