Skip to content
This repository has been archived by the owner on Mar 14, 2023. It is now read-only.

ClearLinux Support #2

Merged
merged 18 commits into from
Jun 14, 2019
Merged

ClearLinux Support #2

merged 18 commits into from
Jun 14, 2019

Conversation

electrocucaracha
Copy link
Contributor

This change is an effort to add support of ClearLinux Distribution.

vagrant/ClearLinux.yml Show resolved Hide resolved
vagrant/krd-vars.yml Outdated Show resolved Hide resolved
;;
esac
#sudo git clone https://github.com/kubernetes-sigs/kubespray $kubespray_folder
sudo git clone https://github.com/electrocucaracha/kubespray $kubespray_folder
Copy link
Contributor

Choose a reason for hiding this comment

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

my expectation is when running on Clear Linux we use k8s what Clear linux ships in cloud-native-basic bundle. The bundle provides easy-to-use installation scripts in /usr/share/clr-k8s-examples

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Contributor

Choose a reason for hiding this comment

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

Does it work for you? A quick look tells me it installs containers-basic (and not cloud-native-basic)

Copy link
Contributor

Choose a reason for hiding this comment

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

I did some checking and apparently kubespray always uses the upstream binaries and not what the OS provides (for cri-o, kubeadm/kubelet). It also does not give you kata-containers.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We can do those changes after Kubernetes is deployed. Eventually we can propose those changes to the Kubespray community

Copy link
Contributor

Choose a reason for hiding this comment

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

We can do those changes after Kubernetes is deployed.

I don't follow what changes? My proposal is for Clear install we use cloud-native-basic and the setup scripts it provides.

vagrant/sample_plugin.sh Outdated Show resolved Hide resolved
vagrant/prechecks.sh Outdated Show resolved Hide resolved
@@ -16,10 +16,10 @@ echo "QAT driver validation"

# Driver validation
supported_dev="c6xx dh895xcc"
qat_svc=$(sudo service qat_service status | grep "There is .* QAT acceleration device(s) in the system:")
qat_svc=$(sudo systemctl status qat_service | grep "There is .* QAT acceleration device(s) in the system:")
Copy link
Contributor

Choose a reason for hiding this comment

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

It seems that adf_ctl status return value is zero if acceleration devices are present in the system. If you can verify this, there is no need to parse the (fragile) service logging output.

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 returns zero if the command was executed properly:

[vagrant@localhost ~]$ sudo /usr/local/bin/adf_ctl status
Checking status of all devices.
There is 0 QAT acceleration device(s) in the system:
[vagrant@localhost ~]$ echo $?
0

Copy link
Contributor

Choose a reason for hiding this comment

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

Did you try the negative case too? If both work then this might be a cleaner way to implement the check.

@electrocucaracha electrocucaracha force-pushed the clearlinux branch 5 times, most recently from 10bcd1a to e0fe4b5 Compare April 18, 2019 00:55
@electrocucaracha electrocucaracha force-pushed the clearlinux branch 4 times, most recently from adf7ae2 to 72e5f98 Compare April 22, 2019 18:48
vagrant/installer.sh Outdated Show resolved Hide resolved
vagrant/installer.sh Outdated Show resolved Hide resolved
@electrocucaracha electrocucaracha force-pushed the clearlinux branch 6 times, most recently from 92bfa68 to 6e0d415 Compare May 1, 2019 23:50
@ipuustin
Copy link
Contributor

ipuustin commented May 2, 2019

I see you force pushed the branch a few times. Please comment if the PR is ready for another review round or if there are still unresolved issues left.

@ipuustin ipuustin mentioned this pull request May 2, 2019
@electrocucaracha
Copy link
Contributor Author

I see you force pushed the branch a few times. Please comment if the PR is ready for another review round or if there are still unresolved issues left.

@ipuustin it's failing when Kata is selected as container runtime. I'll let you know when this can be ready to be reviewed

@electrocucaracha
Copy link
Contributor Author

@ipuustin @mythi I have completed the support for ClearLinux. I need to work on the instructions to don't use the pre-built Kata images, but in the meantime could you review this patch? I created the test.sh script for testing all the possible combinations

vagrant/krd-vars.yml Outdated Show resolved Hide resolved
@electrocucaracha
Copy link
Contributor Author

@mythi and @ipuustin I tried to test every single commit that I made and I tried to isolate the changes to make clear their purpose but the latest version has evolved thanks to your comments, I can try to figure out how to squash some of them as long as this is the final version.

@mythi
Copy link
Contributor

mythi commented Jun 7, 2019

I don't think I have any more comments. podman still needs to be added but ready to take it later.

@electrocucaracha can you try out squashing some of the commits?

@electrocucaracha electrocucaracha force-pushed the clearlinux branch 3 times, most recently from e52cecb to 53cf1e7 Compare June 11, 2019 15:35
@electrocucaracha
Copy link
Contributor Author

I don't think I have any more comments. podman still needs to be added but ready to take it later.

@electrocucaracha can you try out squashing some of the commits?

@mythi I created two branches in my repo, the backup contains the original version with 43 commits ahead of intel:master and the new refactored clearlinux branch with 32 commits ahead. I'm finalizing the tests and I'll let you know when I'm ready.

@mythi
Copy link
Contributor

mythi commented Jun 11, 2019

@electrocucaracha thanks!

@mythi
Copy link
Contributor

mythi commented Jun 12, 2019

@electrocucaracha I checked the latest changes and I'm still not happy with the commits. There are several "intermediate stages" still:

  • enable cri-o, fix cri-o => it should be one 'enable cri-o' but no fixing afterwards
  • enable clearlinux, disable iommu, drop containers-virt, dnnsec => just enable clearlinux
  • add kata, drop kata for docker => add kata for cri-o only
  • kubespray version bumps 2.9 and 2.10 => bump to 2.10

For future PRs, we also need to pay more attention to commit messages. "fix something" is not good unless the message also explains what was broken.

Copy link
Contributor

@mythi mythi left a comment

Choose a reason for hiding this comment

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

@mythi mythi merged commit a07e5a5 into intel:master Jun 14, 2019
@electrocucaracha electrocucaracha deleted the clearlinux branch June 14, 2019 16:48
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants