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

Install dbus if needed for protokube with containerd #10583

Merged
merged 1 commit into from
Jan 21, 2021

Conversation

justinsb
Copy link
Member

Issue #10122

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jan 14, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: justinsb

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 area/nodeup approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jan 14, 2021
@justinsb
Copy link
Member Author

Marking as WIP because I'm not entirely sure when we actually need the dbus mount; it might suffice only to use it when we're not using etcd-manager (and we should probably try so that we can remove the dbus dependency)

@@ -101,6 +101,15 @@ func (t *ProtokubeBuilder) Build(c *fi.ModelBuilderContext) error {
}
c.AddTask(service)

if t.Cluster.Spec.ContainerRuntime == "containerd" {
Copy link
Member

Choose a reason for hiding this comment

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

This is not related just to containerd, but in general, because it is needed by Systemd to work properly (at least that is how I remember from testing a while back).

Copy link
Member

Choose a reason for hiding this comment

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

At most, the condition should be to install dbus if distro is Kopeio.

@rifelpet
Copy link
Member

note that this should fix the legacy etcd prow job as well: https://testgrid.k8s.io/kops-misc#kops-aws-legacy-etcd

@hakman hakman force-pushed the install_dbus branch 3 times, most recently from 232df08 to b750eb1 Compare January 21, 2021 16:17
@hakman hakman changed the title WIP: Install dbus if needed for protokube with containerd Install dbus if needed for protokube with containerd Jan 21, 2021
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 21, 2021
@hakman
Copy link
Member

hakman commented Jan 21, 2021

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 21, 2021
@k8s-ci-robot k8s-ci-robot merged commit bf0ef28 into kubernetes:master Jan 21, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.20 milestone Jan 21, 2021
k8s-ci-robot added a commit that referenced this pull request Jan 21, 2021
…-upstream-release-1.19

Automated cherry pick of #10583: Install dbus if needed for protokube with kope.io
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. area/nodeup 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/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants