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

kola: More calico fixes #359

Merged
merged 5 commits into from
Aug 24, 2022
Merged

kola: More calico fixes #359

merged 5 commits into from
Aug 24, 2022

Conversation

krnowak
Copy link
Member

@krnowak krnowak commented Aug 22, 2022

I'll need to update the github action to mention in the created PR that these templates should be manually compared with the original versions.

There seemed to be a race between using one manifest file to create CRDs and afterwards applying another manifest file that was using those CRDs. Sometimes the CRDs were not established, so the resources of that type could not be used. Use kubectl wait to make sure that those CRDs are ready.

While at it, sync our modified custom-resources.yaml manifest with the upstream and add a note about it to the github action. The note looks like in this PR: krnowak#2.

Test run: http://jenkins.infra.kinvolk.io:8080/job/container/job/test/1988/console (note the customresourcedefinition.apiextensions.k8s.io/installations.operator.tigera.io condition met line in the output, after CRDs were created, but before the object of that type was created).

@krnowak krnowak force-pushed the krnowak/more-calico-fixes branch from 03b7230 to a9fe693 Compare August 22, 2022 10:25
This is to minimize the differences between upstream definition file
and our modified one.
We were often getting an error like:

error: unable to recognize "calico.yaml": no matches for kind
"Installation" in version "operator.tigera.io/v1"
@krnowak krnowak force-pushed the krnowak/more-calico-fixes branch from a9fe693 to 5adf559 Compare August 22, 2022 12:05
@krnowak krnowak changed the title kola: update custom-resources to match calico 3.24.0 kola: More calico fixes Aug 22, 2022
@krnowak krnowak marked this pull request as ready for review August 22, 2022 12:14
@krnowak krnowak requested a review from a team August 22, 2022 12:15
@krnowak
Copy link
Member Author

krnowak commented Aug 22, 2022

@krnowak
Copy link
Member Author

krnowak commented Aug 23, 2022

Tested with my toolchain update build: http://jenkins.infra.kinvolk.io:8080/job/container/job/sdk/204/cldsv/

Copy link
Contributor

@tormath1 tormath1 left a comment

Choose a reason for hiding this comment

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

Thanks a lot for digging into this - it should be more reliable in this way. :)

@krnowak krnowak merged commit c1f68ba into flatcar-master Aug 24, 2022
@krnowak krnowak deleted the krnowak/more-calico-fixes branch August 24, 2022 10:06
@krnowak
Copy link
Member Author

krnowak commented Aug 24, 2022

Thanks for the review. I just remembered that this needs an entry in the changelog. Added one and merged. If you have some suggestions about the entry, I'll fix eventually.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants